From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755058AbcGHMIo (ORCPT ); Fri, 8 Jul 2016 08:08:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52400 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754744AbcGHMIf (ORCPT ); Fri, 8 Jul 2016 08:08:35 -0400 Date: Fri, 8 Jul 2016 05:07:35 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: keescook@chromium.org, brgerst@gmail.com, tglx@linutronix.de, mingo@kernel.org, bp@alien8.de, torvalds@linux-foundation.org, luto@kernel.org, dvlasenk@redhat.com, fweisbec@gmail.com, hpa@zytor.com, bp@suse.de, jpoimboe@redhat.com, luto@amacapital.net, linux-kernel@vger.kernel.org, peterz@infradead.org, akpm@linux-foundation.org Reply-To: fweisbec@gmail.com, luto@amacapital.net, hpa@zytor.com, jpoimboe@redhat.com, bp@suse.de, tglx@linutronix.de, mingo@kernel.org, brgerst@gmail.com, keescook@chromium.org, dvlasenk@redhat.com, torvalds@linux-foundation.org, bp@alien8.de, luto@kernel.org, akpm@linux-foundation.org, peterz@infradead.org, linux-kernel@vger.kernel.org In-Reply-To: References: <1467671487-10344-2-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/debug] x86/dumpstack: Honor supplied @regs arg Git-Commit-ID: ef16dd0c2a523d2e3975bb1bea9f5727e3e7146f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ef16dd0c2a523d2e3975bb1bea9f5727e3e7146f Gitweb: http://git.kernel.org/tip/ef16dd0c2a523d2e3975bb1bea9f5727e3e7146f Author: Andy Lutomirski AuthorDate: Tue, 5 Jul 2016 00:31:25 +0200 Committer: Ingo Molnar CommitDate: Fri, 8 Jul 2016 11:33:18 +0200 x86/dumpstack: Honor supplied @regs arg 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 Signed-off-by: Borislav Petkov Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Kees Cook Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1467671487-10344-2-git-send-email-bp@alien8.de Link: http://lkml.kernel.org/r/efcd79bf4106d61f1cd258c2caa87f3a0618eeac.1466036668.git.luto@kernel.org Signed-off-by: Ingo Molnar --- 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 fef917e..948d77d 100644 --- a/arch/x86/kernel/dumpstack_32.c +++ b/arch/x86/kernel/dumpstack_32.c @@ -96,7 +96,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 d558a8a..a81e1ef 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c @@ -264,7 +264,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;