[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-164c33c6adee609b8b9062cce4c10f764d0dce13@git.kernel.org>
Date: Thu, 5 Jul 2012 23:18:47 -0700
From: tip-bot for Salman Qazi <sqazi@...gle.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
a.p.zijlstra@...llo.nl, sqazi@...gle.com, tglx@...utronix.de
Subject: [tip:sched/core] sched: Fix fork() error path to not crash
Commit-ID: 164c33c6adee609b8b9062cce4c10f764d0dce13
Gitweb: http://git.kernel.org/tip/164c33c6adee609b8b9062cce4c10f764d0dce13
Author: Salman Qazi <sqazi@...gle.com>
AuthorDate: Mon, 25 Jun 2012 18:18:15 -0700
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Thu, 5 Jul 2012 20:57:32 +0200
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@...gle.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Link: http://lkml.kernel.org/r/20120626011815.11323.5533.stgit@dungbeetle.mtv.corp.google.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
kernel/fork.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/kernel/fork.c b/kernel/fork.c
index ab5211b..f00e319 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -304,12 +304,17 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
}
err = arch_dup_task_struct(tsk, orig);
- if (err)
- goto out;
+ /*
+ * We defer looking at err, because we will need this setup
+ * for the clean up path to work correctly.
+ */
tsk->stack = ti;
-
setup_thread_stack(tsk, orig);
+
+ if (err)
+ goto out;
+
clear_user_return_notifier(tsk);
clear_tsk_need_resched(tsk);
stackend = end_of_stack(tsk);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists