x86: disable stack-protector for __restore_processor_state()
authorJoseph Cihula <joseph.cihula@intel.com>
Mon, 30 Mar 2009 21:03:01 +0000 (14:03 -0700)
committerIngo Molnar <mingo@elte.hu>
Fri, 3 Apr 2009 17:48:41 +0000 (19:48 +0200)
The __restore_processor_state() fn restores %gs on resume from S3.  As
such, it cannot be protected by the stack-protector guard since %gs will
not be correct on function entry.

There are only a few other fns in this file and it should not negatively
impact kernel security that they will also have the stack-protector
guard removed (and so it's not worth moving them to another file).

Without this change, S3 resume on a kernel built with
CONFIG_CC_STACKPROTECTOR_ALL=y will fail.

Signed-off-by: Joseph Cihula <joseph.cihula@intel.com>
Tested-by: Chris Wright <chrisw@sous-sol.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Tejun Heo <tj@kernel.org>
LKML-Reference: <49D13385.5060900@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/power/Makefile

index 9ff4d5b55ad182852ef5c4fd2dbb11a372525275..58b32db33125a9eb13cc3859597cfb5b32b2cb4c 100644 (file)
@@ -1,2 +1,7 @@
+# __restore_processor_state() restores %gs after S3 resume and so should not
+# itself be stack-protected
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_cpu_$(BITS).o   := $(nostackp)
+
 obj-$(CONFIG_PM_SLEEP)         += cpu_$(BITS).o
 obj-$(CONFIG_HIBERNATION)      += hibernate_$(BITS).o hibernate_asm_$(BITS).o