From: Andy Lutomirski <luto@kernel.org> To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, Borislav Petkov <bp@alien8.de>, 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>, Jann Horn <jann@thejh.net>, Heiko Carstens <heiko.carstens@de.ibm.com>, Andy Lutomirski <luto@kernel.org> Subject: [PATCH v2 09/13] x86/dumpstack: When dumping stack bytes due to OOPS, start with regs->sp Date: Fri, 17 Jun 2016 13:00:45 -0700 [thread overview] Message-ID: <ac1423ff89885723ceb5c9cb1615b258b2f11544.1466192946.git.luto@kernel.org> (raw) In-Reply-To: <cover.1466192946.git.luto@kernel.org> In-Reply-To: <cover.1466192946.git.luto@kernel.org> The comment suggests that show_stack(NULL, NULL) should backtrace the current context, but the code doesn't match the comment. If regs are given, start the "Stack:" hexdump at regs->sp. Signed-off-by: Andy Lutomirski <luto@kernel.org> --- arch/x86/kernel/dumpstack_32.c | 4 +++- arch/x86/kernel/dumpstack_64.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c index 464ffd69b92e..91069ebe3c87 100644 --- a/arch/x86/kernel/dumpstack_32.c +++ b/arch/x86/kernel/dumpstack_32.c @@ -98,7 +98,9 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, int i; if (sp == NULL) { - if (task) + if (regs) + sp = (unsigned long *)regs->sp; + else if (task) sp = (unsigned long *)task->thread.sp; else sp = (unsigned long *)&sp; diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index 5f1c6266eb30..603356a5597a 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c @@ -266,7 +266,9 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, * back trace for this cpu: */ if (sp == NULL) { - if (task) + if (regs) + sp = (unsigned long *)regs->sp; + else if (task) sp = (unsigned long *)task->thread.sp; else sp = (unsigned long *)&sp; -- 2.5.5
WARNING: multiple messages have this Message-ID (diff)
From: Andy Lutomirski <luto@kernel.org> To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, Borislav Petkov <bp@alien8.de>, 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>, Jann Horn <jann@thejh.net>, Heiko Carstens <heiko.carstens@de.ibm.com>, Andy Lutomirski <luto@kernel.org> Subject: [kernel-hardening] [PATCH v2 09/13] x86/dumpstack: When dumping stack bytes due to OOPS, start with regs->sp Date: Fri, 17 Jun 2016 13:00:45 -0700 [thread overview] Message-ID: <ac1423ff89885723ceb5c9cb1615b258b2f11544.1466192946.git.luto@kernel.org> (raw) In-Reply-To: <cover.1466192946.git.luto@kernel.org> In-Reply-To: <cover.1466192946.git.luto@kernel.org> The comment suggests that show_stack(NULL, NULL) should backtrace the current context, but the code doesn't match the comment. If regs are given, start the "Stack:" hexdump at regs->sp. Signed-off-by: Andy Lutomirski <luto@kernel.org> --- arch/x86/kernel/dumpstack_32.c | 4 +++- arch/x86/kernel/dumpstack_64.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c index 464ffd69b92e..91069ebe3c87 100644 --- a/arch/x86/kernel/dumpstack_32.c +++ b/arch/x86/kernel/dumpstack_32.c @@ -98,7 +98,9 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, int i; if (sp == NULL) { - if (task) + if (regs) + sp = (unsigned long *)regs->sp; + else if (task) sp = (unsigned long *)task->thread.sp; else sp = (unsigned long *)&sp; diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index 5f1c6266eb30..603356a5597a 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c @@ -266,7 +266,9 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, * back trace for this cpu: */ if (sp == NULL) { - if (task) + if (regs) + sp = (unsigned long *)regs->sp; + else if (task) sp = (unsigned long *)task->thread.sp; else sp = (unsigned long *)&sp; -- 2.5.5
next prev parent reply other threads:[~2016-06-17 20:01 UTC|newest] Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-17 20:00 [PATCH v2 00/13] Virtually mapped stacks with guard pages (x86, core) Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` [PATCH v2 01/13] x86/mm/hotplug: Don't remove PGD entries in remove_pagetable() Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` [PATCH v2 02/13] x86/cpa: In populate_pgd, don't set the pgd entry until it's populated Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` [PATCH v2 03/13] x86/cpa: Warn if kernel_unmap_pages_in_pgd is used inappropriately Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:30 ` Borislav Petkov 2016-06-17 20:30 ` [kernel-hardening] " Borislav Petkov 2016-06-17 20:30 ` Borislav Petkov 2016-06-18 10:29 ` Andy Lutomirski 2016-06-18 10:29 ` [kernel-hardening] " Andy Lutomirski 2016-06-18 10:29 ` Andy Lutomirski 2016-06-18 10:37 ` Borislav Petkov 2016-06-18 10:37 ` [kernel-hardening] " Borislav Petkov 2016-06-18 10:37 ` Borislav Petkov 2016-06-17 20:00 ` [PATCH v2 04/13] mm: Track NR_KERNEL_STACK in KiB instead of number of stacks Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-20 13:16 ` Michal Hocko 2016-06-20 13:16 ` [kernel-hardening] " Michal Hocko 2016-06-20 13:16 ` Michal Hocko 2016-06-20 13:16 ` Michal Hocko 2016-06-17 20:00 ` [PATCH v2 05/13] mm: Move memcg stack accounting to account_kernel_stack Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:55 ` Josh Poimboeuf 2016-06-17 20:55 ` [kernel-hardening] " Josh Poimboeuf 2016-06-17 20:55 ` Josh Poimboeuf 2016-06-17 20:55 ` Josh Poimboeuf 2016-06-17 22:18 ` Andy Lutomirski 2016-06-17 22:18 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 22:18 ` Andy Lutomirski 2016-06-17 22:18 ` Andy Lutomirski 2016-06-20 13:02 ` Michal Hocko 2016-06-20 13:02 ` [kernel-hardening] " Michal Hocko 2016-06-20 13:02 ` Michal Hocko 2016-06-20 13:02 ` Michal Hocko 2016-06-20 16:05 ` Andy Lutomirski 2016-06-20 16:05 ` [kernel-hardening] " Andy Lutomirski 2016-06-20 16:05 ` Andy Lutomirski 2016-06-20 16:05 ` Andy Lutomirski 2016-06-17 20:00 ` [PATCH v2 06/13] fork: Add generic vmalloced stack support Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:57 ` Josh Poimboeuf 2016-06-17 20:57 ` [kernel-hardening] " Josh Poimboeuf 2016-06-17 20:57 ` Josh Poimboeuf 2016-06-17 22:18 ` Andy Lutomirski 2016-06-17 22:18 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 22:18 ` Andy Lutomirski 2016-06-20 13:36 ` Michal Hocko 2016-06-20 13:36 ` [kernel-hardening] " Michal Hocko 2016-06-20 13:36 ` Michal Hocko 2016-06-20 13:36 ` Michal Hocko 2016-06-20 16:13 ` Andy Lutomirski 2016-06-20 16:13 ` [kernel-hardening] " Andy Lutomirski 2016-06-20 16:13 ` Andy Lutomirski 2016-06-21 8:46 ` Michal Hocko 2016-06-21 8:46 ` [kernel-hardening] " Michal Hocko 2016-06-21 8:46 ` Michal Hocko 2016-06-21 17:01 ` Andy Lutomirski 2016-06-21 17:01 ` [kernel-hardening] " Andy Lutomirski 2016-06-21 17:01 ` Andy Lutomirski 2016-06-17 20:00 ` [PATCH v2 07/13] x86/die: Don't try to recover from an OOPS on a non-default stack Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` [PATCH v2 08/13] x86/dumpstack: When OOPSing, rewind the stack before do_exit Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski [this message] 2016-06-17 20:00 ` [kernel-hardening] [PATCH v2 09/13] x86/dumpstack: When dumping stack bytes due to OOPS, start with regs->sp Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` [PATCH v2 10/13] x86/dumpstack: Try harder to get a call trace on stack overflow Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` [PATCH v2 11/13] x86/dumpstack/64: Handle faults when printing the "Stack:" part of an OOPS Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` [PATCH v2 12/13] x86/mm/64: Enable vmapped stacks Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` Andy Lutomirski 2016-06-17 20:00 ` [PATCH v2 13/13] x86/mm: Improve stack-overflow #PF handling Andy Lutomirski 2016-06-17 20:00 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 20:00 ` 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=ac1423ff89885723ceb5c9cb1615b258b2f11544.1466192946.git.luto@kernel.org \ --to=luto@kernel.org \ --cc=bp@alien8.de \ --cc=brgerst@gmail.com \ --cc=heiko.carstens@de.ibm.com \ --cc=jann@thejh.net \ --cc=jpoimboe@redhat.com \ --cc=keescook@chromium.org \ --cc=kernel-hardening@lists.openwall.com \ --cc=linux-arch@vger.kernel.org \ --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: linkBe 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.