aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2009-06-17 19:27:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-18 16:03:53 -0400
commitf95d39d10fe7d47336e65172f52bf64e0096f983 (patch)
tree14b469b68455968dfd707695083ece72287dfaab /kernel/exit.c
parenta3f6dfb7295facb0505b5beca5a7ce48b0612379 (diff)
do_wait: fix the theoretical race with stop/trace/cont
do_wait: current->state = TASK_INTERRUPTIBLE; read_lock(&tasklist_lock); ... search for the task to reap ... In theory, the ->state changing can leak into the critical section. Since the child can change its status under read_lock(tasklist) in parallel (finish_stop/ptrace_stop), we can miss the wakeup if __wake_up_parent() sees us in TASK_RUNNING state. Add the barrier. Also, use __set_current_state() to set TASK_RUNNING. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Cc: Ingo Molnar <mingo@elte.hu> Acked-by: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index dd83c8419101..7ef355dd3dca 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1581,7 +1581,7 @@ repeat:
1581 (!wo->wo_pid || hlist_empty(&wo->wo_pid->tasks[wo->wo_type]))) 1581 (!wo->wo_pid || hlist_empty(&wo->wo_pid->tasks[wo->wo_type])))
1582 goto notask; 1582 goto notask;
1583 1583
1584 current->state = TASK_INTERRUPTIBLE; 1584 set_current_state(TASK_INTERRUPTIBLE);
1585 read_lock(&tasklist_lock); 1585 read_lock(&tasklist_lock);
1586 tsk = current; 1586 tsk = current;
1587 do { 1587 do {
@@ -1608,7 +1608,7 @@ notask:
1608 } 1608 }
1609 } 1609 }
1610end: 1610end:
1611 current->state = TASK_RUNNING; 1611 __set_current_state(TASK_RUNNING);
1612 remove_wait_queue(&current->signal->wait_chldexit,&wait); 1612 remove_wait_queue(&current->signal->wait_chldexit,&wait);
1613 if (wo->wo_info) { 1613 if (wo->wo_info) {
1614 struct siginfo __user *infop = wo->wo_info; 1614 struct siginfo __user *infop = wo->wo_info;