linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Andy Lutomirski <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: brgerst@gmail.com, luto@kernel.org, linux-kernel@vger.kernel.org,
	bp@alien8.de, tglx@linutronix.de, torvalds@linux-foundation.org,
	dvlasenk@redhat.com, mingo@kernel.org, peterz@infradead.org,
	jpoimboe@redhat.com, hpa@zytor.com
Subject: [tip:x86/mm] x86/dumpstack/64: Handle faults when printing the "Stack: " part of an OOPS
Date: Fri, 15 Jul 2016 05:01:25 -0700	[thread overview]
Message-ID: <tip-98f30b1207932b6553ea605c99393d8afca12324@git.kernel.org> (raw)
In-Reply-To: <e626d47a55d7b04dcb1b4d33faa95e8505b217c8.1468527351.git.luto@kernel.org>

Commit-ID:  98f30b1207932b6553ea605c99393d8afca12324
Gitweb:     http://git.kernel.org/tip/98f30b1207932b6553ea605c99393d8afca12324
Author:     Andy Lutomirski <luto@kernel.org>
AuthorDate: Thu, 14 Jul 2016 13:22:53 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 15 Jul 2016 10:26:27 +0200

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 <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/e626d47a55d7b04dcb1b4d33faa95e8505b217c8.1468527351.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/dumpstack_64.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index d558a8a..2552a1e 100644
--- 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();

  reply	other threads:[~2016-07-15 12:02 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-14 20:22 [PATCH 00/11] x86: misc prep patches for virtually mapped stacks Andy Lutomirski
2016-07-14 20:22 ` [PATCH 01/11] x86/mm/hotplug: Don't remove PGD entries in remove_pagetable() Andy Lutomirski
2016-07-15 11:59   ` [tip:x86/mm] " tip-bot for Ingo Molnar
2016-07-14 20:22 ` [PATCH 02/11] x86/cpa: In populate_pgd, don't set the pgd entry until it's populated Andy Lutomirski
2016-07-15 11:59   ` [tip:x86/mm] x86/mm/cpa: In populate_pgd(), don't set the PGD " tip-bot for Andy Lutomirski
2016-07-14 20:22 ` [PATCH 03/11] x86/mm: Remove kernel_unmap_pages_in_pgd() and efi_cleanup_page_tables() Andy Lutomirski
2016-07-15 12:00   ` [tip:x86/mm] " tip-bot for Andy Lutomirski
2016-07-14 20:22 ` [PATCH 04/11] x86/dumpstack: Try harder to get a call trace on stack overflow Andy Lutomirski
2016-07-15 12:00   ` [tip:x86/mm] " tip-bot for Andy Lutomirski
2016-07-14 20:22 ` [PATCH 05/11] x86/dumpstack/64: Handle faults when printing the "Stack:" part of an OOPS Andy Lutomirski
2016-07-15 12:01   ` tip-bot for Andy Lutomirski [this message]
2016-07-14 20:22 ` [PATCH 06/11] x86/mm/64: In vmalloc_fault(), use CR3 instead of current->active_mm Andy Lutomirski
2016-07-15 12:01   ` [tip:x86/mm] " tip-bot for Andy Lutomirski
2016-07-14 20:22 ` [PATCH 07/11] x86/dumpstack: When OOPSing, rewind the stack before do_exit() Andy Lutomirski
2016-07-15 12:02   ` [tip:x86/mm] " tip-bot for Andy Lutomirski
2016-07-14 20:22 ` [PATCH 08/11] x86: Move uaccess_err and sig_on_uaccess_err to thread_struct Andy Lutomirski
2016-07-15  8:14   ` Ingo Molnar
2016-07-15 12:02   ` [tip:x86/mm] x86/uaccess: Move thread_info::uaccess_err and thread_info::sig_on_uaccess_err " tip-bot for Andy Lutomirski
2016-07-14 20:22 ` [PATCH 09/11] x86: Move addr_limit " Andy Lutomirski
2016-07-15 12:03   ` [tip:x86/mm] x86/uaccess: Move thread_info::addr_limit " tip-bot for Andy Lutomirski
2016-07-14 20:22 ` [PATCH 10/11] x86/smp: Remove stack_smp_processor_id() Andy Lutomirski
2016-07-15 12:04   ` [tip:x86/mm] " tip-bot for Andy Lutomirski
2016-07-14 20:22 ` [PATCH 11/11] x86/smp: Remove unnecessary initialization of thread_info::cpu Andy Lutomirski
2016-07-15 12:04   ` [tip:x86/mm] " tip-bot for Andy Lutomirski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-98f30b1207932b6553ea605c99393d8afca12324@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=bp@alien8.de \
    --cc=brgerst@gmail.com \
    --cc=dvlasenk@redhat.com \
    --cc=hpa@zytor.com \
    --cc=jpoimboe@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).