Commit 5c1d5f28 authored Jan 21, 2016 by Josh Poimboeuf Committed by Ingo Molnar Feb 24, 2016

watchdog/hpwdt: Create stack frame in asminline_call()

asminline_call() is a callable non-leaf function which doesn't honor
CONFIG_FRAME_POINTER, which can result in bad stack traces.

Create a stack frame when CONFIG_FRAME_POINTER is enabled.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Bernd Petrovitsch <bernd@petrovitsch.priv.at>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Chris J Arges <chris.j.arges@canonical.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Pedro Alves <palves@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: linux-watchdog@vger.kernel.org
Cc: live-patching@vger.kernel.org
Link: http://lkml.kernel.org/r/60de3cfb6f16d413bfb923036cc87fec132df735.1453405861.git.jpoimboe@redhat.com

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent cb7390fe

drivers/watchdog/hpwdt.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -353,10 +353,10 @@ static int detect_cru_service(void)

		asm(".text \n\t"
		".align 4 \n\t"
		".globl asminline_call \n"
		".globl asminline_call \n\t"
		".type asminline_call, @function \n\t"
		"asminline_call: \n\t"
		"pushq %rbp \n\t"
		"movq %rsp, %rbp \n\t"
		FRAME_BEGIN
		"pushq %rax \n\t"
		"pushq %rbx \n\t"
		"pushq %rdx \n\t"
		@@ -386,7 +386,7 @@ asm(".text \n\t"
		"popq %rdx \n\t"
		"popq %rbx \n\t"
		"popq %rax \n\t"
		"leave \n\t"
		FRAME_END
		"ret \n\t"
		".previous");

Admin message