aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/fault.c
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@sandeen.net>2008-04-22 17:38:23 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-26 10:15:33 -0400
commit7c9f8861e6c9c839f913e49b98c3854daca18f27 (patch)
tree220b23dff1aa11a83546fbc73a319575ca489188 /arch/x86/mm/fault.c
parentb40a4392a3c262e0d1b5379b4e142a8eefa63439 (diff)
stackprotector: use canary at end of stack to indicate overruns at oops time
(Updated with a common max-stack-used checker that knows about the canary, as suggested by Joe Perches) Use a canary at the end of the stack to clearly indicate at oops time whether the stack has ever overflowed. This is a very simple implementation with a couple of drawbacks: 1) a thread may legitimately use exactly up to the last word on the stack -- but the chances of doing this and then oopsing later seem slim 2) it's possible that the stack usage isn't dense enough that the canary location could get skipped over -- but the worst that happens is that we don't flag the overrun -- though this happens fairly often in my testing :( With the code in place, an intentionally-bloated stack oops might do: BUG: unable to handle kernel paging request at ffff8103f84cc680 IP: [<ffffffff810253df>] update_curr+0x9a/0xa8 PGD 8063 PUD 0 Thread overran stack or stack corrupted Oops: 0000 [1] SMP CPU 0 ... ... unless the stack overrun is so bad that it corrupts some other thread. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm/fault.c')
-rw-r--r--arch/x86/mm/fault.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index fd7e1798c75a..1f524df68b96 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -25,6 +25,7 @@
25#include <linux/kprobes.h> 25#include <linux/kprobes.h>
26#include <linux/uaccess.h> 26#include <linux/uaccess.h>
27#include <linux/kdebug.h> 27#include <linux/kdebug.h>
28#include <linux/magic.h>
28 29
29#include <asm/system.h> 30#include <asm/system.h>
30#include <asm/desc.h> 31#include <asm/desc.h>
@@ -581,6 +582,8 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
581 unsigned long address; 582 unsigned long address;
582 int write, si_code; 583 int write, si_code;
583 int fault; 584 int fault;
585 unsigned long *stackend;
586
584#ifdef CONFIG_X86_64 587#ifdef CONFIG_X86_64
585 unsigned long flags; 588 unsigned long flags;
586#endif 589#endif
@@ -850,6 +853,10 @@ no_context:
850 853
851 show_fault_oops(regs, error_code, address); 854 show_fault_oops(regs, error_code, address);
852 855
856 stackend = end_of_stack(tsk);
857 if (*stackend != STACK_END_MAGIC)
858 printk(KERN_ALERT "Thread overran stack, or stack corrupted\n");
859
853 tsk->thread.cr2 = address; 860 tsk->thread.cr2 = address;
854 tsk->thread.trap_no = 14; 861 tsk->thread.trap_no = 14;
855 tsk->thread.error_code = error_code; 862 tsk->thread.error_code = error_code;