mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andy Lutomirski <luto@kernel.org>
To: X86 ML <x86@kernel.org>
Cc: Borislav Petkov <bpetkov@suse.de>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Brian Gerst <brgerst@gmail.com>,
	Dave Hansen <dave.hansen@intel.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Josh Poimboeuf <jpoimboe@redhat.com>,
	Andy Lutomirski <luto@kernel.org>
Subject: [PATCH v2 08/18] x86/dumpstack: Handle stack overflow on all stacks
Date: Tue, 21 Nov 2017 20:44:03 -0800	[thread overview]
Message-ID: <2f7a8568777ab77417c30c11e7d0c787b0cf7c5b.1511325444.git.luto@kernel.org> (raw)
In-Reply-To: <cover.1511325444.git.luto@kernel.org>
In-Reply-To: <cover.1511325444.git.luto@kernel.org>

We currently special-case stack overflow on the task stack.  We're
going to start putting special stacks in the fixmap with a custom
layout, so they'll have guard pages, too.  Teach the unwinder to be
able to unwind an overflow of any of the stacks.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
 arch/x86/kernel/dumpstack.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 5e7d10e8ca25..635dcbfe2398 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -90,24 +90,30 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
 	 * - task stack
 	 * - interrupt stack
 	 * - HW exception stacks (double fault, nmi, debug, mce)
+	 * - SYSENTER stack
 	 *
-	 * x86-32 can have up to three stacks:
+	 * x86-32 can have up to four stacks:
 	 * - task stack
 	 * - softirq stack
 	 * - hardirq stack
+	 * - SYSENTER stack
 	 */
 	for (regs = NULL; stack; stack = PTR_ALIGN(stack_info.next_sp, sizeof(long))) {
 		const char *stack_name;
 
-		/*
-		 * If we overflowed the task stack into a guard page, jump back
-		 * to the bottom of the usable stack.
-		 */
-		if (task_stack_page(task) - (void *)stack < PAGE_SIZE)
-			stack = task_stack_page(task);
-
-		if (get_stack_info(stack, task, &stack_info, &visit_mask))
-			break;
+		if (get_stack_info(stack, task, &stack_info, &visit_mask)) {
+			/*
+			 * We weren't on a valid stack.  It's possible that
+			 * we overflowed a valid stack into a guard page.
+			 * See if the next page up is valid to that we can
+			 * generate some kind of backtrace if this happens.
+			 */
+			stack = (unsigned long *)
+				PAGE_ALIGN((unsigned long)stack);
+			if (get_stack_info(stack, task, &stack_info,
+					   &visit_mask))
+				break;
+		}
 
 		stack_name = stack_type_name(stack_info.type);
 		if (stack_name)
-- 
2.13.6

  parent reply	other threads:[~2017-11-22  4:47 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-22  4:43 [PATCH v2 00/18] Entry stack switching Andy Lutomirski
2017-11-22  4:43 ` [PATCH v2 01/18] x86/entry/64: Fix entry_SYSCALL_64_after_hwframe IRQ tracing Andy Lutomirski
2017-11-22  5:35   ` Ingo Molnar
2017-11-22  7:45   ` [tip:x86/urgent] x86/entry/64: Fix entry_SYSCALL_64_after_hwframe() " tip-bot for Andy Lutomirski
2017-11-22  4:43 ` [PATCH v2 02/18] x86/asm/64: Allocate and enable the SYSENTER stack Andy Lutomirski
2017-11-22  4:43 ` [PATCH v2 03/18] x86/dumpstack: Add get_stack_info() support for " Andy Lutomirski
2017-11-22 12:10   ` Borislav Petkov
2017-11-22  4:43 ` [PATCH v2 04/18] x86/gdt: Put per-cpu GDT remaps in ascending order Andy Lutomirski
2017-11-22 11:05   ` Borislav Petkov
2017-11-22 15:26     ` Andy Lutomirski
2017-11-22  4:44 ` [PATCH v2 05/18] x86/fixmap: Generalize the GDT fixmap mechanism Andy Lutomirski
2017-11-22 15:33   ` Borislav Petkov
2017-11-22 17:16     ` Andy Lutomirski
2017-11-22 17:32       ` Borislav Petkov
2017-11-23 15:24         ` Andy Lutomirski
2017-11-23 19:24   ` Thomas Gleixner
2017-11-22  4:44 ` [PATCH v2 06/18] x86/kasan/64: Teach KASAN about the cpu_entry_area Andy Lutomirski
2017-11-22  6:19   ` Ingo Molnar
2017-11-22  9:05   ` Andrey Ryabinin
2017-11-22 15:22     ` Andy Lutomirski
2017-11-23 10:08       ` Andrey Ryabinin
2017-11-23 15:22         ` Andy Lutomirski
2017-11-22  4:44 ` [PATCH v2 07/18] x86/asm: Fix assumptions that the HW TSS is at the beginning of cpu_tss Andy Lutomirski
2017-11-22 19:06   ` Borislav Petkov
2017-11-22  4:44 ` Andy Lutomirski [this message]
2017-11-23 11:19   ` [PATCH v2 08/18] x86/dumpstack: Handle stack overflow on all stacks Borislav Petkov
2017-11-22  4:44 ` [PATCH v2 09/18] x86/asm: Move SYSENTER_stack to the beginning of struct tss_struct Andy Lutomirski
2017-11-23 12:00   ` Borislav Petkov
2017-11-23 13:16   ` Denys Vlasenko
2017-11-23 15:02     ` Andy Lutomirski
2017-11-23 19:30   ` Thomas Gleixner
2017-11-22  4:44 ` [PATCH v2 10/18] x86/asm: Remap the TSS into the cpu entry area Andy Lutomirski
2017-11-23 19:32   ` Thomas Gleixner
2017-11-23 19:55   ` Borislav Petkov
2017-11-23 20:15     ` Andy Lutomirski
2017-11-23 20:37       ` Borislav Petkov
2017-11-24  2:40         ` Andy Lutomirski
2017-11-24  4:17           ` Andy Lutomirski
2017-11-22  4:44 ` [PATCH v2 11/18] x86/asm/64: Separate cpu_current_top_of_stack from TSS.sp0 Andy Lutomirski
2017-11-23 19:34   ` Thomas Gleixner
2017-11-22  4:44 ` [PATCH v2 12/18] x86/espfix/64: Stop assuming that pt_regs is on the entry stack Andy Lutomirski
2017-11-23 19:36   ` Thomas Gleixner
2017-11-22  4:44 ` [PATCH v2 13/18] x86/asm/64: Use a percpu trampoline stack for IDT entries Andy Lutomirski
2017-11-23 23:44   ` Thomas Gleixner
2017-11-24  4:14     ` Andy Lutomirski
2017-11-22  4:44 ` [PATCH v2 14/18] x86/asm/64: Return to userspace from the trampoline stack Andy Lutomirski
2017-11-22  4:44 ` [PATCH v2 15/18] x86/entry/64: Create a percpu SYSCALL entry trampoline Andy Lutomirski
2017-11-22  4:44 ` [PATCH v2 16/18] x86/irq: Remove an old outdated comment about context tracking races Andy Lutomirski
2017-11-22  4:44 ` [PATCH v2 17/18] x86/irq/64: In the stack overflow warning, print the offending IP Andy Lutomirski
2017-11-22  4:44 ` [PATCH v2 18/18] x86/entry/64: Move the IST stacks into cpu_entry_area Andy Lutomirski
2017-11-22  6:22 ` [PATCH v2 00/18] Entry stack switching Ingo Molnar
2017-11-22  6:36   ` Ingo Molnar
2017-11-22 16:23   ` Andy Lutomirski
2017-11-23  6:21     ` Ingo Molnar
2017-11-23  6:44       ` Ingo Molnar
2017-11-23  6:58         ` Ingo Molnar
2017-11-23 15:29           ` Andy Lutomirski
2017-11-23 16:41             ` Thomas Gleixner
2017-11-22  7:39 ` WARNING: can't dereference registers at ffffc90004dfff60 for ip error_entry+0x7d/0xd0 (Re: [PATCH v2 00/18] Entry stack switching) Ingo Molnar
2017-11-22  7:43   ` Ingo Molnar
2017-11-22 13:55   ` Josh Poimboeuf
2017-11-22 15:19     ` Andy Lutomirski
2017-11-22 15:56       ` Ingo Molnar
2017-11-22 16:35         ` 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=2f7a8568777ab77417c30c11e7d0c787b0cf7c5b.1511325444.git.luto@kernel.org \
    --to=luto@kernel.org \
    --cc=bpetkov@suse.de \
    --cc=brgerst@gmail.com \
    --cc=dave.hansen@intel.com \
    --cc=jpoimboe@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --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

all inboxes | Powered by JetHome®