Commit 42059429 authored by Ingo Molnar's avatar Ingo Molnar Committed by Thomas Gleixner

x86: fix the stackprotector canary of the boot CPU

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 18aa8bb1
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <linux/stackprotector.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/sched.h> #include <linux/sched.h>
......
#ifndef _LINUX_STACKPROTECTOR_H #ifndef _LINUX_STACKPROTECTOR_H
#define _LINUX_STACKPROTECTOR_H 1 #define _LINUX_STACKPROTECTOR_H 1
#include <linux/compiler.h>
#include <linux/sched.h>
#include <linux/random.h>
#ifdef CONFIG_CC_STACKPROTECTOR #ifdef CONFIG_CC_STACKPROTECTOR
# include <asm/stackprotector.h> # include <asm/stackprotector.h>
#else #else
......
...@@ -546,6 +546,12 @@ asmlinkage void __init start_kernel(void) ...@@ -546,6 +546,12 @@ asmlinkage void __init start_kernel(void)
unwind_init(); unwind_init();
lockdep_init(); lockdep_init();
debug_objects_early_init(); debug_objects_early_init();
/*
* Set up the the initial canary ASAP:
*/
boot_init_stack_canary();
cgroup_init_early(); cgroup_init_early();
local_irq_disable(); local_irq_disable();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment