diff options
| author | Roland McGrath <roland@redhat.com> | 2006-04-13 03:30:20 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-18 00:16:06 +0400 |
| commit | 18b1e8193eef97f3ac854276a7c4bacbb1bdfbd1 (patch) | |
| tree | ca3e2c553f2744615dbd138d96e7e23f7594dc23 | |
| parent | 49fa79e5689a5c9089a5cdaf396fbdae5f928004 (diff) | |
| download | linux-18b1e8193eef97f3ac854276a7c4bacbb1bdfbd1.tar.xz | |
[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>
| -rw-r--r-- | kernel/ptrace.c | 7 | ||||
| -rw-r--r-- | kernel/signal.c | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index d95a72c9279d..b5eaeb91a7bd 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -57,10 +57,6 @@ void ptrace_untrace(task_t *child) signal_wake_up(child, 1); } } - if (child->signal->flags & SIGNAL_GROUP_EXIT) { - sigaddset(&child->pending.signal, SIGKILL); - signal_wake_up(child, 1); - } spin_unlock(&child->sighand->siglock); } @@ -82,7 +78,8 @@ void __ptrace_unlink(task_t *child) SET_LINKS(child); } - ptrace_untrace(child); + if (child->state == TASK_TRACED) + ptrace_untrace(child); } /* diff --git a/kernel/signal.c b/kernel/signal.c index 54acb53e4b31..acbccf71df6d 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; |