summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2013-01-21 20:48:17 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-22 19:08:17 +0100
commit9067ac85d533651b98c2ff903182a20cbb361fcb (patch)
tree30e741b4f1fa71b155c216d7e7212e3befa3cde3 /kernel
parentptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL (diff)
downloadlinux-9067ac85d533651b98c2ff903182a20cbb361fcb.tar.xz
linux-9067ac85d533651b98c2ff903182a20cbb361fcb.zip
wake_up_process() should be never used to wakeup a TASK_STOPPED/TRACED task
wake_up_process() should never wakeup a TASK_STOPPED/TRACED task. Change it to use TASK_NORMAL and add the WARN_ON(). TASK_ALL has no other users, probably can be killed. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 257002c13bb0..26058d0bebba 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1523,7 +1523,8 @@ out:
*/
int wake_up_process(struct task_struct *p)
{
- return try_to_wake_up(p, TASK_ALL, 0);
+ WARN_ON(task_is_stopped_or_traced(p));
+ return try_to_wake_up(p, TASK_NORMAL, 0);
}
EXPORT_SYMBOL(wake_up_process);