aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-04-18 06:16:45 -0700
committerThomas Gleixner <tglx@linutronix.de>2008-05-26 16:15:33 +0200
commitb40a4392a3c262e0d1b5379b4e142a8eefa63439 (patch)
tree56ed5f9e15da182186db309dbba801db18bfa984
parentb719ac56c0032bc1602914c6ea70b0f1581b08c7 (diff)
stackprotector: turn not having the right gcc into a #warning
If the user selects the stack-protector config option, but does not have a gcc that has the right bits enabled (for example because it isn't build with a glibc that supports TLS, as is common for cross-compilers, but also because it may be too old), then the runtime test fails right now. This patch adds a warning message for this scenario. This warning accomplishes two goals 1) the user is informed that the security option he selective isn't available 2) the user is suggested to turn of the CONFIG option that won't work for him, and would make the runtime test fail anyway. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/Makefile2
-rw-r--r--kernel/panic.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 3cff3c894cf..c3e0eeeb1dd 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -73,7 +73,7 @@ else
stackp := $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh
stackp-$(CONFIG_CC_STACKPROTECTOR) := $(shell $(stackp) \
- "$(CC)" -fstack-protector )
+ "$(CC)" "-fstack-protector -DGCC_HAS_SP" )
stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += $(shell $(stackp) \
"$(CC)" -fstack-protector-all )
diff --git a/kernel/panic.c b/kernel/panic.c
index 866be9b72e4..6729e3f4ebc 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -325,6 +325,9 @@ EXPORT_SYMBOL(warn_on_slowpath);
#ifdef CONFIG_CC_STACKPROTECTOR
+#ifndef GCC_HAS_SP
+#warning You have selected the CONFIG_CC_STACKPROTECTOR option, but the gcc used does not support this.
+#endif
static unsigned long __stack_check_testing;
/*
* Self test function for the stack-protector feature.