diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2013-02-19 14:56:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-04 06:09:05 +0800 |
| commit | 964b12560e1d50f31bc1cc0ac662d52bdbdb6f40 (patch) | |
| tree | bbc317c3b1173bd9ec8ece352ad4ddd3d9933924 /kernel/ptrace.c | |
| parent | 603b86549a4d6928d1059b19df2dfc5d61070533 (diff) | |
| download | kernel_samsung_smdk4412-964b12560e1d50f31bc1cc0ac662d52bdbdb6f40.tar.gz kernel_samsung_smdk4412-964b12560e1d50f31bc1cc0ac662d52bdbdb6f40.tar.bz2 kernel_samsung_smdk4412-964b12560e1d50f31bc1cc0ac662d52bdbdb6f40.zip | |
ptrace: introduce signal_wake_up_state() and ptrace_signal_wake_up()
Upstream commit 910ffdb18a6408e14febbb6e4b6840fd2c928c82.
Cleanup and preparation for the next change.
signal_wake_up(resume => true) is overused. None of ptrace/jctl callers
actually want to wakeup a TASK_WAKEKILL task, but they can't specify the
necessary mask.
Turn signal_wake_up() into signal_wake_up_state(state), reintroduce
signal_wake_up() as a trivial helper, and add ptrace_signal_wake_up()
which adds __TASK_TRACED.
This way ptrace_signal_wake_up() can work "inside" ptrace_request()
even if the tracee doesn't have the TASK_WAKEKILL bit set.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/ptrace.c')
| -rw-r--r-- | kernel/ptrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 2df115790cd..d77fa9eb082 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -92,7 +92,7 @@ void __ptrace_unlink(struct task_struct *child) * TASK_KILLABLE sleeps. */ if (child->group_stop & GROUP_STOP_PENDING || task_is_traced(child)) - signal_wake_up(child, task_is_traced(child)); + ptrace_signal_wake_up(child, true); spin_unlock(&child->sighand->siglock); } @@ -245,7 +245,7 @@ static int ptrace_attach(struct task_struct *task) */ if (task_is_stopped(task)) { task->group_stop |= GROUP_STOP_PENDING | GROUP_STOP_TRAPPING; - signal_wake_up(task, 1); + signal_wake_up_state(task, __TASK_STOPPED); wait_trap = true; } |