aboutsummaryrefslogtreecommitdiff
path: root/kernel/signal.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2006-04-12 16:30:20 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-04-17 13:16:06 -0700
commit18b1e8193eef97f3ac854276a7c4bacbb1bdfbd1 (patch)
treeca3e2c553f2744615dbd138d96e7e23f7594dc23 /kernel/signal.c
parent49fa79e5689a5c9089a5cdaf396fbdae5f928004 (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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 54acb53e4b3..acbccf71df6 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1942,9 +1942,9 @@ relock:
/* Let the debugger run. */
ptrace_stop(signr, signr, info);
- /* We're back. Did the debugger cancel the sig or group_exit? */
+ /* We're back. Did the debugger cancel the sig? */
signr = current->exit_code;
- if (signr == 0 || current->signal->flags & SIGNAL_GROUP_EXIT)
+ if (signr == 0)
continue;
current->exit_code = 0;