lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tracehook: fix SA_NOCLDWAIT

Browse Source 
I outwitted myself again in commit 2b2a1ff64a,
and broke the SA_NOCLDWAIT behavior so it leaks zombies.  This fixes it.

Reported-by: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Roland McGrath <roland@redhat.com>
This commit is contained in:
Roland McGrath
2008-08-19 20:37:07 -07:00
parent 1fca254274
commit 1b04624f93
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/signal.c
View File

@@ -1338,6 +1338,7 @@ int do_notify_parent(struct task_struct *tsk, int sig)
struct siginfo info; struct siginfo info;
unsigned long flags; unsigned long flags;
struct sighand_struct *psig; struct sighand_struct *psig;
int ret = sig;
BUG_ON(sig == -1); BUG_ON(sig == -1);
@@ -1402,7 +1403,7 @@ int do_notify_parent(struct task_struct *tsk, int sig)
* is implementation-defined: we do (if you don't want * is implementation-defined: we do (if you don't want
* it, just use SIG_IGN instead). * it, just use SIG_IGN instead).
*/ */
tsk->exit_signal = -1; ret = tsk->exit_signal = -1;
if (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN) if (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN)
sig = -1; sig = -1;
} }
@@ -1411,7 +1412,7 @@ int do_notify_parent(struct task_struct *tsk, int sig)
__wake_up_parent(tsk, tsk->parent); __wake_up_parent(tsk, tsk->parent);
spin_unlock_irqrestore(&psig->siglock, flags); spin_unlock_irqrestore(&psig->siglock, flags);
return sig; return ret;
} }
static void do_notify_parent_cldstop(struct task_struct *tsk, int why) static void do_notify_parent_cldstop(struct task_struct *tsk, int why)