diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-10 12:10:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-10 12:10:02 -0700 |
| commit | f5364c150aa645b3d7daa21b5c0b9feaa1c9cd6d (patch) | |
| tree | a7445608f147d3a7214382c5db3f5d721ee99369 /kernel | |
| parent | 33fc259a2053f89d6ea0f07f534079b58899d128 (diff) | |
| parent | 29d6455178a09e1dc340380c582b13356227e8df (diff) | |
| download | blackbird-obmc-linux-f5364c150aa645b3d7daa21b5c0b9feaa1c9cd6d.tar.gz blackbird-obmc-linux-f5364c150aa645b3d7daa21b5c0b9feaa1c9cd6d.zip | |
Merge branch 'stacking-fixes' (vfs stacking fixes from Jann)
Merge filesystem stacking fixes from Jann Horn.
* emailed patches from Jann Horn <jannh@google.com>:
sched: panic on corrupted stack end
ecryptfs: forbid opening files without mmap handler
proc: prevent stacking filesystems on top
Diffstat (limited to 'kernel')
| -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 385c947482e1..017d5394f5dc 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3170,7 +3170,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())) { |
