x86: fix the stackprotector canary of the boot CPU

[deliverable/linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index f7fb20021d48d5a4a175cc79d84f6b3cfb9eab53..b44e4eb0f5e3d807044358db2ea4130ebeba724a 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -14,6 +14,7 @@
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
 #include <linux/syscalls.h>
+#include <linux/stackprotector.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
@@ -545,6 +546,12 @@ asmlinkage void __init start_kernel(void)
        unwind_init();
        lockdep_init();
        debug_objects_early_init();
+
+       /*
+        * Set up the the initial canary ASAP:
+        */
+       boot_init_stack_canary();
+
        cgroup_init_early();
 
        local_irq_disable();