[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1471024364-46217-1-git-send-email-thgarnie@google.com>
Date: Fri, 12 Aug 2016 10:52:44 -0700
From: Thomas Garnier <thgarnie@...gle.com>
To: "Rafael J . Wysocki" <rjw@...ysocki.net>,
Len Brown <len.brown@...el.com>,
Pavel Machek <pavel@....cz>
Cc: linux-pm@...r.kernel.org,
linux-kernel@...r.kernel.org,
keescook@...omium.org,
kernel-hardening@...ts.openwall.com,
jikos@...nel.org,
bpetkov@...e.de,
yinghai@...nel.org,
Thomas Garnier <thgarnie@...gle.com>
Subject: [PATCH v2] x86/power/64: Restore processor state before using per-cpu variables
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 <jkosina@...e.cz>
Tested-by: Jiri Kosina <jkosina@...e.cz>
Acked-by: Pavel Machek <pavel@....cz>
Reported-and-tested-by: Borislav Petkov <bp@...e.de>
Signed-off-by: Thomas Garnier <thgarnie@...gle.com>
---
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(-)
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;
--
2.8.0.rc3.226.g39d4020
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
