diff options
author | Salman Qazi <sqazi@google.com> | 2012-06-25 21:18:15 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-07-05 14:57:32 -0400 |
commit | 164c33c6adee609b8b9062cce4c10f764d0dce13 (patch) | |
tree | 47ff40e1ae3d8206dd900e64d757ce16a3ee0774 | |
parent | 9e85a6f9dc231f3ed3c1dc1b12217505d970142a (diff) |
sched: Fix fork() error path to not crash
In dup_task_struct(), if arch_dup_task_struct() fails, the clean up
code fails to clean up correctly. That's because the clean up
code depends on unininitalized ti->task pointer. We fix this
by making sure that the task and thread_info know about each other
before we attempt to take the error path.
Signed-off-by: Salman Qazi <sqazi@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20120626011815.11323.5533.stgit@dungbeetle.mtv.corp.google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | kernel/fork.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index ab5211b9e622..f00e319d8376 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -304,12 +304,17 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) | |||
304 | } | 304 | } |
305 | 305 | ||
306 | err = arch_dup_task_struct(tsk, orig); | 306 | err = arch_dup_task_struct(tsk, orig); |
307 | if (err) | ||
308 | goto out; | ||
309 | 307 | ||
308 | /* | ||
309 | * We defer looking at err, because we will need this setup | ||
310 | * for the clean up path to work correctly. | ||
311 | */ | ||
310 | tsk->stack = ti; | 312 | tsk->stack = ti; |
311 | |||
312 | setup_thread_stack(tsk, orig); | 313 | setup_thread_stack(tsk, orig); |
314 | |||
315 | if (err) | ||
316 | goto out; | ||
317 | |||
313 | clear_user_return_notifier(tsk); | 318 | clear_user_return_notifier(tsk); |
314 | clear_tsk_need_resched(tsk); | 319 | clear_tsk_need_resched(tsk); |
315 | stackend = end_of_stack(tsk); | 320 | stackend = end_of_stack(tsk); |