mirror of
https://github.com/joel16/android_kernel_sony_msm8994.git
synced 2024-11-30 15:41:27 +00:00
tracehook: fix SA_NOCLDWAIT
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:
parent
1fca254274
commit
1b04624f93
@ -1338,6 +1338,7 @@ int do_notify_parent(struct task_struct *tsk, int sig)
|
||||
struct siginfo info;
|
||||
unsigned long flags;
|
||||
struct sighand_struct *psig;
|
||||
int ret = sig;
|
||||
|
||||
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
|
||||
* 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)
|
||||
sig = -1;
|
||||
}
|
||||
@ -1411,7 +1412,7 @@ int do_notify_parent(struct task_struct *tsk, int sig)
|
||||
__wake_up_parent(tsk, tsk->parent);
|
||||
spin_unlock_irqrestore(&psig->siglock, flags);
|
||||
|
||||
return sig;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void do_notify_parent_cldstop(struct task_struct *tsk, int why)
|
||||
|
Loading…
Reference in New Issue
Block a user