exec: Cleanup exec from a non thread group leader.
Subsystems (2)
PATCH 1/1 exec: Cleanup exec from a non thread group leader.
This patch modifies switch_exec_pids so that it uses the normal attach_pid/detach_pid functions. This makes the code more maintainable and it removes a race where find_pid could fail to find a thread group or a process id that currently exists.
We also now preserve the exit_signal of our thread group leader when we call exec (when we take over the thread group leaders identity).
And for good measure we set the thread group leaders exit_signal to -1 so it will self reap. We are actually past the point where that matters but it can't hurt, and it might help someday.
Signed-off-by Eric W. Biederman <[email protected]>
---
fs/exec.c | 3 ++- kernel/pid.c | 33 +++++++++++++-------------------- 2 files changed, 15 insertions(+), 21 deletions(-)
dab45943cf60c11f4432d6fdd26d68eb7092b8dd
fs/exec.c +2 -1
@@ -721,10 +721,11 @@ static int de_thread(struct task_structlist_del (¤t->tasks);list_add_tail (¤t->tasks, &init_task.tasks); - current->exit_signal =SIGCHLD ; + current->exit_signal = leader->exit_signal;BUG_ON (leader->exit_state !=EXIT_ZOMBIE ); leader->exit_state =EXIT_DEAD ; + leader->exit_signal =-1 ;write_unlock_irq (&tasklist_lock);spin_unlock (&leader->proc_lock);
kernel/pid.c +13 -20
@@ -220,31 +220,24 @@ EXPORT_SYMBOL(find_task_by_pid_type);/* * This function switches the PIDs if a non-leader thread calls * sys_execve() - this must be done without releasing the PID. -* (which a detach_pid() would eventually do.) +* +* The attach and detach operations have been carefully +* ordered so there is never an instant that pids that will +* survive are absent from the hash table. This ensures +* that we don't release pids we mean to keep. */ void switch_exec_pids (task_t *leader,task_t *thread) { -__detach_pid (leader,PIDTYPE_PID ); -__detach_pid (leader,PIDTYPE_TGID ); -__detach_pid (leader,PIDTYPE_PGID ); -__detach_pid (leader,PIDTYPE_SID ); - -__detach_pid (thread,PIDTYPE_PID ); -__detach_pid (thread,PIDTYPE_TGID ); - - leader->pid = leader->tgid = thread->pid; - thread->pid = thread->tgid; - -attach_pid (thread,PIDTYPE_PID , thread->pid); -attach_pid (thread,PIDTYPE_TGID , thread->tgid); +detach_pid (thread,PIDTYPE_PID ); + thread->pid = leader->pid; +attach_pid (thread,PIDTYPE_PID , thread->pid);attach_pid (thread,PIDTYPE_PGID , thread->signal->pgrp); -attach_pid (thread,PIDTYPE_SID , thread->signal->session); -list_add_tail (&thread->tasks, &init_task.tasks); +attach_pid (thread,PIDTYPE_SID , thread->signal->session); -attach_pid (leader,PIDTYPE_PID , leader->pid); -attach_pid (leader,PIDTYPE_TGID , leader->tgid); -attach_pid (leader,PIDTYPE_PGID , leader->signal->pgrp); -attach_pid (leader,PIDTYPE_SID , leader->signal->session); +detach_pid (leader,PIDTYPE_PID ); +detach_pid (leader,PIDTYPE_TGID ); +detach_pid (leader,PIDTYPE_PGID ); +detach_pid (leader,PIDTYPE_SID ); }/*
Signature · 1 line
1.1.5.g3480