Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/x86/kernel/process_64.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <stdarg.h>



#include <linux/stackprotector.h>

#include <linux/cpu.h>

#include <linux/errno.h>

#include <linux/sched.h>

include/linux/stackprotector.h

+4 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_STACKPROTECTOR_H

#define _LINUX_STACKPROTECTOR_H 1



#include <linux/compiler.h>

#include <linux/sched.h>

#include <linux/random.h>



#ifdef CONFIG_CC_STACKPROTECTOR

# include <asm/stackprotector.h>

#else

init/main.c

+6 −0
Original line number Diff line number Diff line
@@ -546,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();