diff options
-rw-r--r-- | arch/x86/kernel/process_64.c | 1 | ||||
-rw-r--r-- | include/linux/stackprotector.h | 4 | ||||
-rw-r--r-- | init/main.c | 6 |
3 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 5107cb214c7..cce47f7fbf2 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
@@ -16,6 +16,7 @@ | |||
16 | 16 | ||
17 | #include <stdarg.h> | 17 | #include <stdarg.h> |
18 | 18 | ||
19 | #include <linux/stackprotector.h> | ||
19 | #include <linux/cpu.h> | 20 | #include <linux/cpu.h> |
20 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
21 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
diff --git a/include/linux/stackprotector.h b/include/linux/stackprotector.h index 422e71aafd0..6f3e54c704c 100644 --- a/include/linux/stackprotector.h +++ b/include/linux/stackprotector.h | |||
@@ -1,6 +1,10 @@ | |||
1 | #ifndef _LINUX_STACKPROTECTOR_H | 1 | #ifndef _LINUX_STACKPROTECTOR_H |
2 | #define _LINUX_STACKPROTECTOR_H 1 | 2 | #define _LINUX_STACKPROTECTOR_H 1 |
3 | 3 | ||
4 | #include <linux/compiler.h> | ||
5 | #include <linux/sched.h> | ||
6 | #include <linux/random.h> | ||
7 | |||
4 | #ifdef CONFIG_CC_STACKPROTECTOR | 8 | #ifdef CONFIG_CC_STACKPROTECTOR |
5 | # include <asm/stackprotector.h> | 9 | # include <asm/stackprotector.h> |
6 | #else | 10 | #else |
diff --git a/init/main.c b/init/main.c index a84322ca64a..b44e4eb0f5e 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -546,6 +546,12 @@ asmlinkage void __init start_kernel(void) | |||
546 | unwind_init(); | 546 | unwind_init(); |
547 | lockdep_init(); | 547 | lockdep_init(); |
548 | debug_objects_early_init(); | 548 | debug_objects_early_init(); |
549 | |||
550 | /* | ||
551 | * Set up the the initial canary ASAP: | ||
552 | */ | ||
553 | boot_init_stack_canary(); | ||
554 | |||
549 | cgroup_init_early(); | 555 | cgroup_init_early(); |
550 | 556 | ||
551 | local_irq_disable(); | 557 | local_irq_disable(); |