Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1460967

Re: [PATCH v1] x86/power/64: Restore processor state before using per-cpu variables

Show all headers | View raw

Hi!

> Restore the processor state before calling any other function to ensure
> per-cpu variables can be used with KASLR memory randomization.
> 
> Tracing functions use per-cpu variables (gs based) and one was called
> just before restoring the processor state fully. It resulted in a double
> fault when both the tracing & the exception handler functions tried to
> use a per-cpu variable.
> 
> Signed-off-by: Thomas Garnier <thgarnie@google.com>
> ---
> Based on next-20160808
> 
> Thanks to Rafael, Jiri & Borislav in tracking down this bug.
> ---
>  kernel/power/hibernate.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index a881c6a..33c79b6 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -300,12 +300,12 @@ static int create_image(int platform_mode)
>  	save_processor_state();
>  	trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, true);
>  	error = swsusp_arch_suspend();
> +	/* Restore control flow magically appears here */
> +	restore_processor_state();
>  	trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, false);
>  	if (error)
>  		printk(KERN_ERR "PM: Error %d creating hibernation image\n",
>  			error);
> -	/* Restore control flow magically appears here */
> -	restore_processor_state();
>  	if (!in_suspend)
>  		events_check_enabled = false;
>  

Ugh. Plus it also fixes very confusing situation where /* Restore
control flow magically appears here */ comment was 4 lines away from
where it _actually_ magically appeared. Good catch.

Acked-by: Pavel Machek <pavel@ucw.cz>

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v1] x86/power/64: Restore processor state before using per-cpu variables Thomas Garnier <thgarnie@google.com> - 2016-08-12 00:00 +0200
  Re: [PATCH v1] x86/power/64: Restore processor state before using  per-cpu variables Borislav Petkov <bp@suse.de> - 2016-08-12 08:00 +0200
    Re: [PATCH v1] x86/power/64: Restore processor state before using  per-cpu variables "Rafael J. Wysocki" <rafael@kernel.org> - 2016-08-12 13:20 +0200
      Re: [PATCH v1] x86/power/64: Restore processor state before using  per-cpu variables Thomas Garnier <thgarnie@google.com> - 2016-08-12 18:10 +0200
        Re: [PATCH v1] x86/power/64: Restore processor state before using  per-cpu variables Borislav Petkov <bp@suse.de> - 2016-08-12 19:50 +0200
  Re: [PATCH v1] x86/power/64: Restore processor state before using  per-cpu variables Jiri Kosina <jikos@kernel.org> - 2016-08-12 08:10 +0200
    Re: [PATCH v1] x86/power/64: Restore processor state before using  per-cpu variables Jiri Kosina <jikos@kernel.org> - 2016-08-12 11:30 +0200
      Re: [PATCH v1] x86/power/64: Restore processor state before using  per-cpu variables Thomas Garnier <thgarnie@google.com> - 2016-08-12 18:10 +0200
  Re: [PATCH v1] x86/power/64: Restore processor state before using  per-cpu variables Pavel Machek <pavel@denx.de> - 2016-08-12 08:30 +0200

csiph-web