linux-kernel - Re: [PATCH v15 23/25] x86/asm/power: Create stack frames in hibernate_asm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Sun, 20 Dec 2015 17:14:05 +0100
From:	"Rafael J. Wysocki" <rjw@...ysocki.net>
To:	Josh Poimboeuf <jpoimboe@...hat.com>
Cc:	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...hat.com>,
	"H. Peter Anvin" <hpa@...or.com>, x86@...nel.org,
	linux-kernel@...r.kernel.org, live-patching@...r.kernel.org,
	Michal Marek <mmarek@...e.cz>,
	Peter Zijlstra <peterz@...radead.org>,
	Andy Lutomirski <luto@...nel.org>,
	Borislav Petkov <bp@...en8.de>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	Andi Kleen <andi@...stfloor.org>,
	Pedro Alves <palves@...hat.com>,
	Namhyung Kim <namhyung@...il.com>,
	Bernd Petrovitsch <bernd@...rovitsch.priv.at>,
	Chris J Arges <chris.j.arges@...onical.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Jiri Slaby <jslaby@...e.cz>,
	Arnaldo Carvalho de Melo <acme@...nel.org>,
	Pavel Machek <pavel@....cz>
Subject: Re: [PATCH v15 23/25] x86/asm/power: Create stack frames in hibernate_asm_64.S

On Friday, December 18, 2015 06:39:37 AM Josh Poimboeuf wrote:
> swsusp_arch_suspend() and restore_registers() are callable non-leaf
> functions which don't honor CONFIG_FRAME_POINTER, which can result in
> bad stack traces.  Also they aren't annotated as ELF callable functions
> which can confuse tooling.
> 
> Create a stack frame for them when CONFIG_FRAME_POINTER is enabled and
> give them proper ELF function annotations.
> 
> Signed-off-by: Josh Poimboeuf <jpoimboe@...hat.com>
> Acked-by: Pavel Machek <pavel@....cz>
> Cc: Rafael J. Wysocki <rjw@...ysocki.net>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>

> ---
>  arch/x86/power/hibernate_asm_64.S | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S
> index e2386cb..4400a43 100644
> --- a/arch/x86/power/hibernate_asm_64.S
> +++ b/arch/x86/power/hibernate_asm_64.S
> @@ -21,8 +21,10 @@
>  #include <asm/page_types.h>
>  #include <asm/asm-offsets.h>
>  #include <asm/processor-flags.h>
> +#include <asm/frame.h>
>  
>  ENTRY(swsusp_arch_suspend)
> +	FRAME_BEGIN
>  	movq	$saved_context, %rax
>  	movq	%rsp, pt_regs_sp(%rax)
>  	movq	%rbp, pt_regs_bp(%rax)
> @@ -50,7 +52,9 @@ ENTRY(swsusp_arch_suspend)
>  	movq	%rax, restore_cr3(%rip)
>  
>  	call swsusp_save
> +	FRAME_END
>  	ret
> +ENDPROC(swsusp_arch_suspend)
>  
>  ENTRY(restore_image)
>  	/* switch to temporary page tables */
> @@ -107,6 +111,7 @@ ENTRY(core_restore_code)
>  	 */
>  
>  ENTRY(restore_registers)
> +	FRAME_BEGIN
>  	/* go back to the original page tables */
>  	movq    %rbx, %cr3
>  
> @@ -147,4 +152,6 @@ ENTRY(restore_registers)
>  	/* tell the hibernation core that we've just restored the memory */
>  	movq	%rax, in_suspend(%rip)
>  
> +	FRAME_END
>  	ret
> +ENDPROC(restore_registers)
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/