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 11/13] x86/dumpstack/64: Handle faults when printing the "Stack:" part of an OOPS
Date: Wed, 15 Jun 2016 17:28:33 -0700 [thread overview]
Message-ID: <539f9b6f7ef8c23d416a3d4841f1a25135cc37e4.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 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>
---
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 603356a5597a..5e298638c790 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -276,6 +276,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]);
@@ -285,12 +287,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();
--
2.7.4
next prev parent reply other threads:[~2016-06-16 0:28 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-16 0:28 [kernel-hardening] [PATCH 00/13] Virtually mapped stacks with guard pages (x86, core) Andy Lutomirski
2016-06-16 0:28 ` [kernel-hardening] [PATCH 01/13] x86/mm/hotplug: Don't remove PGD entries in remove_pagetable() Andy Lutomirski
2016-06-16 0:28 ` [kernel-hardening] [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] [PATCH 03/13] x86/cpa: Warn if kernel_unmap_pages_in_pgd is used inappropriately Andy Lutomirski
2016-06-16 0:28 ` [kernel-hardening] [PATCH 04/13] mm: Track NR_KERNEL_STACK in pages instead of number of stacks Andy Lutomirski
2016-06-16 11:10 ` [kernel-hardening] " Vladimir Davydov
2016-06-16 17:21 ` Andy Lutomirski
2016-06-16 19:20 ` Andy Lutomirski
2016-06-16 15:33 ` Josh Poimboeuf
2016-06-16 17:39 ` Andy Lutomirski
2016-06-16 19:39 ` Josh Poimboeuf
2016-06-16 0:28 ` [kernel-hardening] [PATCH 05/13] mm: Move memcg stack accounting to account_kernel_stack Andy Lutomirski
2016-06-16 0:28 ` [kernel-hardening] [PATCH 06/13] fork: Add generic vmalloced stack support Andy Lutomirski
2016-06-16 17:25 ` [kernel-hardening] " Kees Cook
2016-06-16 17:37 ` Andy Lutomirski
2016-06-16 0:28 ` [kernel-hardening] [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] [PATCH 08/13] x86/dumpstack: When OOPSing, rewind the stack before do_exit Andy Lutomirski
2016-06-16 17:50 ` [kernel-hardening] " Josh Poimboeuf
2016-06-16 17:57 ` Andy Lutomirski
2016-06-16 0:28 ` [kernel-hardening] [PATCH 09/13] x86/dumpstack: When dumping stack bytes due to OOPS, start with regs->sp Andy Lutomirski
2016-06-16 11:56 ` [kernel-hardening] " Borislav Petkov
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 ` [kernel-hardening] " Josh Poimboeuf
2016-06-16 18:22 ` Andy Lutomirski
2016-06-16 18:33 ` Josh Poimboeuf
2016-06-16 18:37 ` Andy Lutomirski
2016-06-16 18:54 ` Josh Poimboeuf
2016-06-16 0:28 ` Andy Lutomirski [this message]
2016-06-16 0:28 ` [kernel-hardening] [PATCH 12/13] x86/mm/64: Enable vmapped stacks Andy Lutomirski
2016-06-16 4:17 ` [kernel-hardening] " Mika Penttilä
2016-06-16 5:33 ` Andy Lutomirski
2016-06-16 13:11 ` Rik van Riel
2016-06-16 0:28 ` [kernel-hardening] [PATCH 13/13] x86/mm: Improve stack-overflow #PF handling Andy Lutomirski
2016-06-16 6:05 ` [kernel-hardening] Re: [PATCH 00/13] Virtually mapped stacks with guard pages (x86, core) Heiko Carstens
2016-06-16 17:50 ` Andy Lutomirski
2016-06-16 18:14 ` Andy Lutomirski
2016-06-16 21:27 ` Andy Lutomirski
2016-06-17 3:58 ` Andy Lutomirski
2016-06-17 7:27 ` Heiko Carstens
2016-06-17 17:38 ` Andy Lutomirski
2016-06-20 5:58 ` Heiko Carstens
2016-06-20 6:01 ` Andy Lutomirski
2016-06-20 7:07 ` Heiko Carstens
2016-06-16 17:24 ` Kees Cook
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=539f9b6f7ef8c23d416a3d4841f1a25135cc37e4.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 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).