diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-06-10 16:52:03 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-06-11 22:04:47 +0200 |
commit | d7880812b3594d3c6dcbe3cfd71dabb17347d082 (patch) | |
tree | 87d72f75a691ac0d23776afcde0e9f35c09d8148 /include | |
parent | c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff) | |
download | linux-stable-d7880812b3594d3c6dcbe3cfd71dabb17347d082.tar.gz linux-stable-d7880812b3594d3c6dcbe3cfd71dabb17347d082.tar.bz2 linux-stable-d7880812b3594d3c6dcbe3cfd71dabb17347d082.zip |
idle: Add the stack canary init to cpu_startup_entry()
Moving x86 to the generic idle implementation (commit 7d1a9417 "x86:
Use generic idle loop") wreckaged the stack protector.
I stupidly missed that boot_init_stack_canary() must be inlined from a
function which never returns, but I put that call into
arch_cpu_idle_prepare() which of course returns.
I pondered to play tricks with arch_cpu_idle_prepare() first, but then
I noticed, that the other archs which have implemented the
stackprotector (ARM and SH) do not initialize the canary for the
non-boot cpus.
So I decided to move the boot_init_stack_canary() call into
cpu_startup_entry() ifdeffed with an CONFIG_X86 for now. This #ifdef
is just a temporary measure as I don't want to inflict the
boot_init_stack_canary() call on ARM and SH that late in the cycle.
I'll queue a patch for 3.11 which removes the #ifdef if the ARM/SH
maintainers have no objection.
Reported-by: Wouter van Kesteren <woutershep@gmail.com>
Cc: x86@kernel.org
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions