x86/dumpstack/64: Handle faults when printing the "Stack: " part of an OOPS

If we overflow the stack into a guard page, we'll recursively fault
when trying to dump the contents of the guard page.  Use
probe_kernel_address() so we can recover if this happens.

Signed-off-by: Andy Lutomirski <[email protected]>
Reviewed-by: Josh Poimboeuf <[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]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/e626d47a55d7b04dcb1b4d33faa95e8505b217c8.1468527351.git.luto@kernel.org
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index d558a8a49016b2c6eccb50f3685cc136fdc621ad..2552a1eadfedf4ef792d075ae52e10f6e93231d2 100644 (file)
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -272,6 +272,8 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
 
        stack = sp;
        for (i = 0; i < kstack_depth_to_print; i++) {
+               unsigned long word;
+
                if (stack >= irq_stack && stack <= irq_stack_end) {
                        if (stack == irq_stack_end) {
                                stack = (unsigned long *) (irq_stack_end[-1]);
@@ -281,12 +283,18 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
                if (kstack_end(stack))
                        break;
                }
+
+               if (probe_kernel_address(stack, word))
+                       break;
+
                if ((i % STACKSLOTS_PER_LINE) == 0) {
                        if (i != 0)
                                pr_cont("\n");
-                       printk("%s %016lx", log_lvl, *stack++);
+                       printk("%s %016lx", log_lvl, word);
                } else
-                       pr_cont(" %016lx", *stack++);
+                       pr_cont(" %016lx", word);
+
+               stack++;
                touch_nmi_watchdog();
        }
        preempt_enable();