AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

do_wait: fix the theoretical race with stop/trace/cont

Browse Source 
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>
This commit is contained in:
Oleg Nesterov 2009-06-17 16:27:42 -07:00 committed by Linus Torvalds
parent a3f6dfb729
commit f95d39d10f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/exit.c
View File

@ -1581,7 +1581,7 @@ static long do_wait(struct wait_opts *wo)
(!wo->wo_pid || hlist_empty(&wo->wo_pid->tasks[wo->wo_type]))) (!wo->wo_pid || hlist_empty(&wo->wo_pid->tasks[wo->wo_type])))
goto notask; goto notask;
current->state = TASK_INTERRUPTIBLE; set_current_state(TASK_INTERRUPTIBLE);
read_lock(&tasklist_lock); read_lock(&tasklist_lock);
tsk = current; tsk = current;
do { do {
@ -1608,7 +1608,7 @@ static long do_wait(struct wait_opts *wo)
} }
} }
end: end:
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
remove_wait_queue(&current->signal->wait_chldexit,&wait); remove_wait_queue(&current->signal->wait_chldexit,&wait);
if (wo->wo_info) { if (wo->wo_info) {
struct siginfo __user *infop = wo->wo_info; struct siginfo __user *infop = wo->wo_info;