luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: fix the stackprotector canary of the boot CPU

Browse Source 
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Ingo Molnar 2008-02-14 09:44:08 +01:00 committed by Thomas Gleixner
parent 18aa8bb12d
commit 4205942968
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/kernel/process_64.c
View File

@ -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>

4
include/linux/stackprotector.h
View File

@ -1,6 +1,10 @@
#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

6
init/main.c
View File

@ -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();