Skip to content

Commit e335bb5

Browse files
jpoimboeIngo Molnar
authored andcommitted
x86/unwind: Ensure stack pointer is aligned
With frame pointers disabled, on some older versions of GCC (like 4.8.3), it's possible for the stack pointer to get aligned at a half-word boundary: 00000000000004d0 <fib_table_lookup>: 4d0: 41 57 push %r15 4d2: 41 56 push %r14 4d4: 41 55 push %r13 4d6: 41 54 push %r12 4d8: 55 push %rbp 4d9: 53 push %rbx 4da: 48 83 ec 24 sub $0x24,%rsp In such a case, the unwinder ends up reading the entire stack at the wrong alignment. Then the last read goes past the end of the stack, hitting the stack guard page: BUG: stack guard page was hit at ffffc900217c4000 (stack is ffffc900217c0000..ffffc900217c3fff) kernel stack overflow (page fault): 0000 [#1] SMP ... Fix it by ensuring the stack pointer is properly aligned before unwinding. Reported-by: Jirka Hladky <[email protected]> Signed-off-by: Josh Poimboeuf <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Fixes: 7c7900f ("x86/unwind: Add new unwind interface and implementations") Link: http://lkml.kernel.org/r/cff33847cc9b02fa548625aa23268ac574460d8d.1492436590.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar <[email protected]>
1 parent f26dee1 commit e335bb5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

arch/x86/kernel/dumpstack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
7777
* - softirq stack
7878
* - hardirq stack
7979
*/
80-
for (regs = NULL; stack; stack = stack_info.next_sp) {
80+
for (regs = NULL; stack; stack = PTR_ALIGN(stack_info.next_sp, sizeof(long))) {
8181
const char *stack_name;
8282

8383
/*

arch/x86/kernel/unwind_guess.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ bool unwind_next_frame(struct unwind_state *state)
3434
return true;
3535
}
3636

37-
state->sp = info->next_sp;
37+
state->sp = PTR_ALIGN(info->next_sp, sizeof(long));
3838

3939
} while (!get_stack_info(state->sp, state->task, info,
4040
&state->stack_mask));
@@ -49,7 +49,7 @@ void __unwind_start(struct unwind_state *state, struct task_struct *task,
4949
memset(state, 0, sizeof(*state));
5050

5151
state->task = task;
52-
state->sp = first_frame;
52+
state->sp = PTR_ALIGN(first_frame, sizeof(long));
5353

5454
get_stack_info(first_frame, state->task, &state->stack_info,
5555
&state->stack_mask);

0 commit comments

Comments
 (0)