Skip to content

Commit

Permalink
stackprotector: add boot_init_stack_canary()
Browse files Browse the repository at this point in the history
add the boot_init_stack_canary() and make the secondary idle threads
use it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Ingo Molnar authored and Thomas Gleixner committed May 26, 2008
1 parent 9b5609f commit 18aa8bb
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 4 deletions.
6 changes: 2 additions & 4 deletions arch/x86/kernel/process_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ void cpu_idle(void)
{
current_thread_info()->status |= TS_POLLING;

#ifdef CONFIG_CC_STACKPROTECTOR
/*
* If we're the non-boot CPU, nothing set the PDA stack
* canary up for us - and if we are the boot CPU we have
Expand All @@ -156,9 +155,8 @@ void cpu_idle(void)
* invalid canaries already on the stack wont ever
* trigger):
*/
current->stack_canary = get_random_int();
write_pda(stack_canary, current->stack_canary);
#endif
boot_init_stack_canary();

/* endless idle loop with no priority at all */
while (1) {
tick_nohz_stop_sched_tick();
Expand Down
20 changes: 20 additions & 0 deletions include/asm-x86/stackprotector.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
#ifndef _ASM_STACKPROTECTOR_H
#define _ASM_STACKPROTECTOR_H 1

/*
* Initialize the stackprotector canary value.
*
* NOTE: this must only be called from functions that never return,
* and it must always be inlined.
*/
static __always_inline void boot_init_stack_canary(void)
{
/*
* If we're the non-boot CPU, nothing set the PDA stack
* canary up for us - and if we are the boot CPU we have
* a 0 stack canary. This is a good place for updating
* it, as we wont ever return from this function (so the
* invalid canaries already on the stack wont ever
* trigger):
*/
current->stack_canary = get_random_int();
write_pda(stack_canary, current->stack_canary);
}

#endif
4 changes: 4 additions & 0 deletions include/linux/stackprotector.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

#ifdef CONFIG_CC_STACKPROTECTOR
# include <asm/stackprotector.h>
#else
static inline void boot_init_stack_canary(void)
{
}
#endif

#endif

0 comments on commit 18aa8bb

Please sign in to comment.