Commit ef16dd0c authored Jul 05, 2016 by Andy Lutomirski Committed by Ingo Molnar Jul 08, 2016

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 <luto@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
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 <mingo@kernel.org>

parent a99cde43

arch/x86/kernel/dumpstack_32.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;

arch/x86/kernel/dumpstack_64.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;