All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Lutomirski <luto@kernel.org>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	x86@kernel.org, Borislav Petkov <bp@alien8.de>
Cc: Nadav Amit <nadav.amit@gmail.com>,
	Kees Cook <keescook@chromium.org>,
	Brian Gerst <brgerst@gmail.com>,
	"kernel-hardening@lists.openwall.com" 
	<kernel-hardening@lists.openwall.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Josh Poimboeuf <jpoimboe@redhat.com>,
	Andy Lutomirski <luto@kernel.org>
Subject: [PATCH 10/13] x86/dumpstack: Try harder to get a call trace on stack overflow
Date: Wed, 15 Jun 2016 17:28:32 -0700	[thread overview]
Message-ID: <f3202c855a2a61ae4c37d8b3835e00fb384c56b9.1466036668.git.luto@kernel.org> (raw)
In-Reply-To: <cover.1466036668.git.luto@kernel.org>
In-Reply-To: <cover.1466036668.git.luto@kernel.org>

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>
---
 arch/x86/kernel/dumpstack.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index d4d085e27d04..400a2e17c1d1 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -100,6 +100,13 @@ print_context_stack(struct thread_info *tinfo,
 {
 	struct stack_frame *frame = (struct stack_frame *)bp;
 
+	/*
+	 * If we overflowed the stack into a guard page, jump back to the
+	 * bottom of the usable stack.
+	 */
+	if ((unsigned long)tinfo - (unsigned long)stack < PAGE_SIZE)
+		stack = (unsigned long *)tinfo + 1;
+
 	while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
 		unsigned long addr;
 
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: Andy Lutomirski <luto@kernel.org>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	x86@kernel.org, Borislav Petkov <bp@alien8.de>
Cc: Nadav Amit <nadav.amit@gmail.com>,
	Kees Cook <keescook@chromium.org>,
	Brian Gerst <brgerst@gmail.com>,
	"kernel-hardening@lists.openwall.com"
	<kernel-hardening@lists.openwall.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Josh Poimboeuf <jpoimboe@redhat.com>,
	Andy Lutomirski <luto@kernel.org>
Subject: [kernel-hardening] [PATCH 10/13] x86/dumpstack: Try harder to get a call trace on stack overflow
Date: Wed, 15 Jun 2016 17:28:32 -0700	[thread overview]
Message-ID: <f3202c855a2a61ae4c37d8b3835e00fb384c56b9.1466036668.git.luto@kernel.org> (raw)
In-Reply-To: <cover.1466036668.git.luto@kernel.org>
In-Reply-To: <cover.1466036668.git.luto@kernel.org>

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>
---
 arch/x86/kernel/dumpstack.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index d4d085e27d04..400a2e17c1d1 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -100,6 +100,13 @@ print_context_stack(struct thread_info *tinfo,
 {
 	struct stack_frame *frame = (struct stack_frame *)bp;
 
+	/*
+	 * If we overflowed the stack into a guard page, jump back to the
+	 * bottom of the usable stack.
+	 */
+	if ((unsigned long)tinfo - (unsigned long)stack < PAGE_SIZE)
+		stack = (unsigned long *)tinfo + 1;
+
 	while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
 		unsigned long addr;
 
-- 
2.7.4

  parent reply	other threads:[~2016-06-16  0:30 UTC|newest]

Thread overview: 112+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-16  0:28 [PATCH 00/13] Virtually mapped stacks with guard pages (x86, core) Andy Lutomirski
2016-06-16  0:28 ` [kernel-hardening] " Andy Lutomirski
2016-06-16  0:28 ` [PATCH 01/13] x86/mm/hotplug: Don't remove PGD entries in remove_pagetable() Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16  0:28   ` Andy Lutomirski
2016-06-16  0:28 ` [PATCH 02/13] x86/cpa: In populate_pgd, don't set the pgd entry until it's populated Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16  0:28 ` [PATCH 03/13] x86/cpa: Warn if kernel_unmap_pages_in_pgd is used inappropriately Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16  0:28 ` [PATCH 04/13] mm: Track NR_KERNEL_STACK in pages instead of number of stacks Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16  0:28   ` Andy Lutomirski
2016-06-16 11:10   ` Vladimir Davydov
2016-06-16 11:10     ` [kernel-hardening] " Vladimir Davydov
2016-06-16 11:10     ` Vladimir Davydov
2016-06-16 17:21     ` Andy Lutomirski
2016-06-16 17:21       ` [kernel-hardening] " Andy Lutomirski
2016-06-16 17:21       ` Andy Lutomirski
2016-06-16 19:20       ` Andy Lutomirski
2016-06-16 19:20         ` [kernel-hardening] " Andy Lutomirski
2016-06-16 19:20         ` Andy Lutomirski
2016-06-16 15:33   ` Josh Poimboeuf
2016-06-16 15:33     ` [kernel-hardening] " Josh Poimboeuf
2016-06-16 15:33     ` Josh Poimboeuf
2016-06-16 17:39     ` Andy Lutomirski
2016-06-16 17:39       ` [kernel-hardening] " Andy Lutomirski
2016-06-16 17:39       ` Andy Lutomirski
2016-06-16 19:39       ` Josh Poimboeuf
2016-06-16 19:39         ` [kernel-hardening] " Josh Poimboeuf
2016-06-16 19:39         ` Josh Poimboeuf
2016-06-16  0:28 ` [PATCH 05/13] mm: Move memcg stack accounting to account_kernel_stack Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16  0:28   ` Andy Lutomirski
2016-06-16  0:28 ` [PATCH 06/13] fork: Add generic vmalloced stack support Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16 17:25   ` Kees Cook
2016-06-16 17:25     ` [kernel-hardening] " Kees Cook
2016-06-16 17:37     ` Andy Lutomirski
2016-06-16 17:37       ` [kernel-hardening] " Andy Lutomirski
2016-06-16  0:28 ` [PATCH 07/13] x86/die: Don't try to recover from an OOPS on a non-default stack Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16  0:28 ` [PATCH 08/13] x86/dumpstack: When OOPSing, rewind the stack before do_exit Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16 17:50   ` Josh Poimboeuf
2016-06-16 17:50     ` [kernel-hardening] " Josh Poimboeuf
2016-06-16 17:57     ` Andy Lutomirski
2016-06-16 17:57       ` [kernel-hardening] " Andy Lutomirski
2016-06-16  0:28 ` [PATCH 09/13] x86/dumpstack: When dumping stack bytes due to OOPS, start with regs->sp Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16 11:56   ` Borislav Petkov
2016-06-16 11:56     ` [kernel-hardening] " Borislav Petkov
2016-07-08 12:07   ` [tip:x86/debug] x86/dumpstack: Honor supplied @regs arg tip-bot for Andy Lutomirski
2016-06-16  0:28 ` Andy Lutomirski [this message]
2016-06-16  0:28   ` [kernel-hardening] [PATCH 10/13] x86/dumpstack: Try harder to get a call trace on stack overflow Andy Lutomirski
2016-06-16 18:16   ` Josh Poimboeuf
2016-06-16 18:16     ` [kernel-hardening] " Josh Poimboeuf
2016-06-16 18:22     ` Andy Lutomirski
2016-06-16 18:22       ` [kernel-hardening] " Andy Lutomirski
2016-06-16 18:33       ` Josh Poimboeuf
2016-06-16 18:33         ` [kernel-hardening] " Josh Poimboeuf
2016-06-16 18:37         ` Andy Lutomirski
2016-06-16 18:37           ` [kernel-hardening] " Andy Lutomirski
2016-06-16 18:54           ` Josh Poimboeuf
2016-06-16 18:54             ` [kernel-hardening] " Josh Poimboeuf
2016-06-16  0:28 ` [PATCH 11/13] x86/dumpstack/64: Handle faults when printing the "Stack:" part of an OOPS Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16  0:28 ` [PATCH 12/13] x86/mm/64: Enable vmapped stacks Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16  4:17   ` Mika Penttilä
2016-06-16  4:17     ` [kernel-hardening] " Mika Penttilä
2016-06-16  5:33     ` Andy Lutomirski
2016-06-16  5:33       ` [kernel-hardening] " Andy Lutomirski
2016-06-16 13:11       ` Rik van Riel
2016-06-16  0:28 ` [PATCH 13/13] x86/mm: Improve stack-overflow #PF handling Andy Lutomirski
2016-06-16  0:28   ` [kernel-hardening] " Andy Lutomirski
2016-06-16  6:05 ` [PATCH 00/13] Virtually mapped stacks with guard pages (x86, core) Heiko Carstens
2016-06-16  6:05   ` [kernel-hardening] " Heiko Carstens
2016-06-16 17:50   ` Andy Lutomirski
2016-06-16 17:50     ` [kernel-hardening] " Andy Lutomirski
2016-06-16 18:14     ` Andy Lutomirski
2016-06-16 18:14       ` [kernel-hardening] " Andy Lutomirski
2016-06-16 21:27       ` Andy Lutomirski
2016-06-16 21:27         ` [kernel-hardening] " Andy Lutomirski
2016-06-17  3:58   ` Andy Lutomirski
2016-06-17  3:58     ` [kernel-hardening] " Andy Lutomirski
2016-06-17  7:27     ` Heiko Carstens
2016-06-17  7:27       ` [kernel-hardening] " Heiko Carstens
2016-06-17 17:38       ` Andy Lutomirski
2016-06-17 17:38         ` [kernel-hardening] " Andy Lutomirski
2016-06-20  5:58         ` Heiko Carstens
2016-06-20  5:58           ` [kernel-hardening] " Heiko Carstens
2016-06-20  6:01           ` Andy Lutomirski
2016-06-20  6:01             ` [kernel-hardening] " Andy Lutomirski
2016-06-20  7:07             ` Heiko Carstens
2016-06-20  7:07               ` [kernel-hardening] " Heiko Carstens
2016-06-16 17:24 ` Kees Cook
2016-06-16 17:24   ` [kernel-hardening] " Kees Cook
2016-07-04 22:31 [PATCH -v2 0/3] x86/MSR: Improve unhandled MSR access error message Borislav Petkov
2016-07-04 22:31 ` [PATCH -v2 1/3] x86/dumpstack: Honor supplied @regs arg Borislav Petkov
2016-07-04 22:31 ` [PATCH -v2 2/3] printk: Make the printk*once() variants return a value Borislav Petkov
2016-07-08 12:08   ` [tip:x86/debug] " tip-bot for Borislav Petkov
2016-07-09  2:40     ` Joe Perches
2016-07-09  7:50       ` Borislav Petkov
2016-07-09 17:56         ` Joe Perches
2016-07-10  6:49           ` Borislav Petkov
2016-07-10  8:23             ` Joe Perches
2016-07-10 12:06               ` Borislav Petkov
2016-07-10 12:33                 ` Joe Perches
2016-07-04 22:31 ` [PATCH -v2 3/3] x86/dumpstack: Add show_stack_regs() and use it Borislav Petkov
2016-07-08 12:08   ` [tip:x86/debug] " tip-bot for Borislav Petkov
2016-07-06 12:58 ` [PATCH -v2 0/3] x86/MSR: Improve unhandled MSR access error message Andy Lutomirski
2016-07-06 13:11   ` Borislav Petkov

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=f3202c855a2a61ae4c37d8b3835e00fb384c56b9.1466036668.git.luto@kernel.org \
    --to=luto@kernel.org \
    --cc=bp@alien8.de \
    --cc=brgerst@gmail.com \
    --cc=jpoimboe@redhat.com \
    --cc=keescook@chromium.org \
    --cc=kernel-hardening@lists.openwall.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nadav.amit@gmail.com \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.