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

Commit Message

Thomas Garnier Aug. 12, 2016, 5:52 p.m. UTC

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.

Reported-by: Jiri Kosina <[e-mail]>
Tested-by: Jiri Kosina <[e-mail]>
Acked-by: Pavel Machek <[e-mail]>
Reported-and-tested-by: Borislav Petkov <[e-mail]>
Signed-off-by: Thomas Garnier <[e-mail]>
---
Based on next-20160808

Thanks to Rafael, Jiri & Borislav in tracking down this bug and help
testing this fix.
---
 kernel/power/hibernate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

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;