diff options
author | Nicolas Pitre <nico@fluxnic.net> | 2010-05-24 23:55:42 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2010-06-14 21:31:00 -0400 |
commit | c743f38013aeff58ef6252601e397b5ba281c633 (patch) | |
tree | b364e1690aff8a0dd97a83d4cb17bcadcdb5bd19 /arch/arm/kernel/process.c | |
parent | cc92c28b2db5b406657ecc05235d4ca4e222ae34 (diff) |
ARM: initial stack protector (-fstack-protector) support
This is the very basic stuff without the changing canary upon
task switch yet. Just the Kconfig option and a constant canary
value initialized at boot time.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm/kernel/process.c')
-rw-r--r-- | arch/arm/kernel/process.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 1c6eb7ed9642..090ac9459da1 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
@@ -37,6 +37,12 @@ | |||
37 | #include <asm/stacktrace.h> | 37 | #include <asm/stacktrace.h> |
38 | #include <asm/mach/time.h> | 38 | #include <asm/mach/time.h> |
39 | 39 | ||
40 | #ifdef CONFIG_CC_STACKPROTECTOR | ||
41 | #include <linux/stackprotector.h> | ||
42 | unsigned long __stack_chk_guard __read_mostly; | ||
43 | EXPORT_SYMBOL(__stack_chk_guard); | ||
44 | #endif | ||
45 | |||
40 | static const char *processor_modes[] = { | 46 | static const char *processor_modes[] = { |
41 | "USER_26", "FIQ_26" , "IRQ_26" , "SVC_26" , "UK4_26" , "UK5_26" , "UK6_26" , "UK7_26" , | 47 | "USER_26", "FIQ_26" , "IRQ_26" , "SVC_26" , "UK4_26" , "UK5_26" , "UK6_26" , "UK7_26" , |
42 | "UK8_26" , "UK9_26" , "UK10_26", "UK11_26", "UK12_26", "UK13_26", "UK14_26", "UK15_26", | 48 | "UK8_26" , "UK9_26" , "UK10_26", "UK11_26", "UK12_26", "UK13_26", "UK14_26", "UK15_26", |