x86: disable stack-protector for __restore_processor_state()
Subsystems (2)
PATCH 1/1 x86: disable stack-protector for __restore_processor_state()
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.
x86/power/Makefile renamed from linux.trees.git/arch/x86/power/Makefile +5 -0
@@ -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
Ingo Molnar
AppliedQuoted 9 lines · Joseph Cihula
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).
Quoted 4 lines
Without this change, S3 resume on a kernel built with
CONFIG_CC_STACKPROTECTOR_ALL=ywill fail.Signed-off-by Joseph Cihula <[email protected]>
ah ... very nice!
applied to tip:x86/urgent, thanks Joseph!
Ingo
Commit-ID: 1f23b77e09be10edb30eb03c1b03879083e3cc72 Gitweb: http://git.kernel.org/tip/1f23b77e09be10edb30eb03c1b03879083e3cc72 Author: Joseph Cihula <[email protected]> AuthorDate: Mon, 30 Mar 2009 14:03:01 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 3 Apr 2009 19:30:23 +0200
x86: disable stack-protector for __restore_processor_state()
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.
LKML-Reference: <[email protected]>
--- arch/x86/power/Makefile | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
arch/x86/power/Makefile +5 -0
@@ -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
Commit-ID: 9b7b89efa3bdaceaa2efb93e2d635391835da209 Gitweb: http://git.kernel.org/tip/9b7b89efa3bdaceaa2efb93e2d635391835da209 Author: Joseph Cihula <[email protected]> AuthorDate: Mon, 30 Mar 2009 14:03:01 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 3 Apr 2009 19:48:41 +0200
x86: disable stack-protector for __restore_processor_state()
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.
LKML-Reference: <[email protected]>
--- arch/x86/power/Makefile | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
arch/x86/power/Makefile +5 -0
@@ -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