aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Nesterov2013-02-19 07:56:53 -0600
committerGreg Kroah-Hartman2013-03-03 16:09:06 -0600
commit8a9279a5af607d9f59b3921c639df139a28bcef6 (patch)
treecd74e15719dea0c2272f70c29688b4a55a40a8ce
parenta214998c48e204227d52a81dd459ea51a8a9ae36 (diff)
downloadkernel-common-8a9279a5af607d9f59b3921c639df139a28bcef6.tar.gz
kernel-common-8a9279a5af607d9f59b3921c639df139a28bcef6.tar.xz
kernel-common-8a9279a5af607d9f59b3921c639df139a28bcef6.zip
wake_up_process() should be never used to wakeup a TASK_STOPPED/TRACED task
Upstream commit 9067ac85d533651b98c2ff903182a20cbb361fcb. 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> Cc: Michal Hocko <mhocko@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/sched.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index aacd55f8d4e..cd2b7cb638f 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2778,7 +2778,8 @@ out:
2778 */ 2778 */
2779int wake_up_process(struct task_struct *p) 2779int wake_up_process(struct task_struct *p)
2780{ 2780{
2781 return try_to_wake_up(p, TASK_ALL, 0); 2781 WARN_ON(task_is_stopped_or_traced(p));
2782 return try_to_wake_up(p, TASK_NORMAL, 0);
2782} 2783}
2783EXPORT_SYMBOL(wake_up_process); 2784EXPORT_SYMBOL(wake_up_process);
2784 2785