diff options
| author | Jann Horn <jannh@google.com> | 2016-06-01 11:55:07 +0200 |
|---|---|---|
| committer | Min Chong <mchong@google.com> | 2016-07-25 13:03:32 -0700 |
| commit | 85a09f2732f9d0bbb9fdec98f292f1db6c75a96a (patch) | |
| tree | 22038c600b38ce78304c7d11af9385778fe7c54b | |
| parent | ed23e1145053fb43639a178e89e99bb14f11272b (diff) | |
UPSTREAM: sched: panic on corrupted stack end
(cherry picked from commit 29d6455178a09e1dc340380c582b13356227e8df)
Until now, hitting this BUG_ON caused a recursive oops (because oops
handling involves do_exit(), which calls into the scheduler, which in
turn raises an oops), which caused stuff below the stack to be
overwritten until a panic happened (e.g. via an oops in interrupt
context, caused by the overwritten CPU index in the thread_info).
Just panic directly.
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Change-Id: Ia3acb3f747f7a58ec2d071644433b0591925969f
Bug: 29444228
| -rw-r--r-- | kernel/sched/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 61b0914cc7aa..b290af9c37a1 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3008,7 +3008,8 @@ static noinline void __schedule_bug(struct task_struct *prev) static inline void schedule_debug(struct task_struct *prev) { #ifdef CONFIG_SCHED_STACK_END_CHECK - BUG_ON(task_stack_end_corrupted(prev)); + if (task_stack_end_corrupted(prev)) + panic("corrupted stack end detected inside scheduler\n"); #endif if (unlikely(in_atomic_preempt_off())) { |