From 18b1e8193eef97f3ac854276a7c4bacbb1bdfbd1 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 12 Apr 2006 16:30:20 -0700
Subject: [PATCH] [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>
---
kernel/ptrace.c | 7 ++-----
kernel/signal.c | 4 ++--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index d95a72c9279dc..b5eaeb91a7bd8 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 54acb53e4b318..acbccf71df6dc 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1942,9 +1942,9 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
/* 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;
--
GitLab