Skip to content

Commit 4f7fd4d

Browse files
fenrus75Andi Kleen
authored andcommitted
[PATCH] Add the -fstack-protector option to the CFLAGS
Add a feature check that checks that the gcc compiler has stack-protector support and has the bugfix for PR28281 to make this work in kernel mode. The easiest solution I could find was to have a shell script in scripts/ to do the detection; if needed we can make this fancier in the future without making the makefile too complex. Signed-off-by: Arjan van de Ven <[email protected]> Signed-off-by: Andi Kleen <[email protected]> CC: Andi Kleen <[email protected]> CC: Sam Ravnborg <[email protected]>
1 parent 3162f75 commit 4f7fd4d

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

arch/x86_64/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
5858
cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
5959
AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
6060

61+
cflags-$(CONFIG_CC_STACKPROTECTOR) += $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) -fstack-protector )
62+
cflags-$(CONFIG_CC_STACKPROTECTOR_ALL) += $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) -fstack-protector-all )
63+
6164
CFLAGS += $(cflags-y)
6265
CFLAGS_KERNEL += $(cflags-kernel-y)
6366
AFLAGS += -m64
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
3+
echo "int foo(void) { char X[200]; return 3; }" | $1 -S -xc -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
4+
if [ "$?" -eq "0" ] ; then
5+
echo $2
6+
fi

0 commit comments

Comments
 (0)