diff options
author | Roland McGrath <roland@redhat.com> | 2006-04-12 19:30:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 11:59:13 -0400 |
commit | e57a5059846e55d82b86d96dde40e988598601b3 (patch) | |
tree | 85b0f48406b37b46261735cbdd66e379977a0327 /kernel/signal.c | |
parent | c06511d12d720b23c8dffff23004f0a888698f20 (diff) |
[PATCH] fix non-leader exec under ptrace
This reverts most of commit 30e0fca6c1d7d26f3f2daa4dd2b12c51dadc778a.
It broke the case of non-leader MT exec when ptraced.
I think the bug it was intended to fix was already addressed by commit
788e05a67c343fa22f2ae1d3ca264e7f15c25eaf.
Signed-off-by: Roland McGrath <roland@redhat.com>
Acked-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r-- | kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index b14f895027c3..e5f8aea78ffe 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -1754,9 +1754,9 @@ relock: | |||
1754 | /* Let the debugger run. */ | 1754 | /* Let the debugger run. */ |
1755 | ptrace_stop(signr, signr, info); | 1755 | ptrace_stop(signr, signr, info); |
1756 | 1756 | ||
1757 | /* We're back. Did the debugger cancel the sig or group_exit? */ | 1757 | /* We're back. Did the debugger cancel the sig? */ |
1758 | signr = current->exit_code; | 1758 | signr = current->exit_code; |
1759 | if (signr == 0 || current->signal->flags & SIGNAL_GROUP_EXIT) | 1759 | if (signr == 0) |
1760 | continue; | 1760 | continue; |
1761 | 1761 | ||
1762 | current->exit_code = 0; | 1762 | current->exit_code = 0; |