diff options
author | Andy Lutomirski <luto@kernel.org> | 2016-07-14 16:22:52 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-07-15 04:26:26 -0400 |
commit | 9a2e9da3e003112399f2863b7b6b911043c01895 (patch) | |
tree | 3de10e8eaabd99a08d0c2a10076fc9a455df9661 /arch/x86/kernel | |
parent | d92fc69ccac4c0a20679fdbdc81b2010685a6f33 (diff) |
x86/dumpstack: Try harder to get a call trace on stack overflow
If we overflow the stack, print_context_stack() will abort. Detect
this case and rewind back into the valid part of the stack so that
we can trace it.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/ee1690eb2715ccc5dc187fde94effa4ca0ccbbcd.1468527351.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/dumpstack.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index ef8017ca5ba9..cc88e25d73e9 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
@@ -87,7 +87,7 @@ static inline int valid_stack_ptr(struct task_struct *task, | |||
87 | else | 87 | else |
88 | return 0; | 88 | return 0; |
89 | } | 89 | } |
90 | return p > t && p < t + THREAD_SIZE - size; | 90 | return p >= t && p < t + THREAD_SIZE - size; |
91 | } | 91 | } |
92 | 92 | ||
93 | unsigned long | 93 | unsigned long |
@@ -98,6 +98,14 @@ print_context_stack(struct task_struct *task, | |||
98 | { | 98 | { |
99 | struct stack_frame *frame = (struct stack_frame *)bp; | 99 | struct stack_frame *frame = (struct stack_frame *)bp; |
100 | 100 | ||
101 | /* | ||
102 | * If we overflowed the stack into a guard page, jump back to the | ||
103 | * bottom of the usable stack. | ||
104 | */ | ||
105 | if ((unsigned long)task_stack_page(task) - (unsigned long)stack < | ||
106 | PAGE_SIZE) | ||
107 | stack = (unsigned long *)task_stack_page(task); | ||
108 | |||
101 | while (valid_stack_ptr(task, stack, sizeof(*stack), end)) { | 109 | while (valid_stack_ptr(task, stack, sizeof(*stack), end)) { |
102 | unsigned long addr; | 110 | unsigned long addr; |
103 | 111 | ||