Skip to content

Commit 7241d26

Browse files
chleroympe
authored andcommitted
powerpc/64: properly initialise the stackprotector canary on SMP.
commit 06ec27a ("powerpc/64: add stack protector support") doesn't initialise the stack canary on SMP secondary CPU's paca, leading to the following false positive report from the stack protector. smp: Bringing up secondary CPUs ... Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: __schedule+0x978/0xa80 CPU: 1 PID: 0 Comm: swapper/1 Not tainted 4.19.0-rc7-next-20181010-autotest-autotest #1 Call Trace: [c000001fed5b3bf0] [c000000000a0ef3c] dump_stack+0xb0/0xf4 (unreliable) [c000001fed5b3c30] [c0000000000f9d68] panic+0x140/0x308 [c000001fed5b3cc0] [c0000000000f9844] __stack_chk_fail+0x24/0x30 [c000001fed5b3d20] [c000000000a2c3a8] __schedule+0x978/0xa80 [c000001fed5b3e00] [c000000000a2c9b4] schedule_idle+0x34/0x60 [c000001fed5b3e30] [c00000000013d344] do_idle+0x224/0x3d0 [c000001fed5b3ec0] [c00000000013d6e0] cpu_startup_entry+0x30/0x50 [c000001fed5b3ef0] [c000000000047f34] start_secondary+0x4d4/0x520 [c000001fed5b3f90] [c00000000000b370] start_secondary_prolog+0x10/0x14 This patch properly initialises the stack_canary of the secondary idle tasks. Reported-by: Abdul Haleem <[email protected]> Fixes: 06ec27a ("powerpc/64: add stack protector support") Signed-off-by: Christophe Leroy <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent 9b7e4d6 commit 7241d26

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Diff for: arch/powerpc/kernel/smp.c

+8
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <linux/topology.h>
3535
#include <linux/profile.h>
3636
#include <linux/processor.h>
37+
#include <linux/random.h>
3738

3839
#include <asm/ptrace.h>
3940
#include <linux/atomic.h>
@@ -810,9 +811,16 @@ static void cpu_idle_thread_init(unsigned int cpu, struct task_struct *idle)
810811
{
811812
struct thread_info *ti = task_thread_info(idle);
812813

814+
#ifdef CONFIG_STACKPROTECTOR
815+
idle->stack_canary = get_random_canary();
816+
#endif
817+
813818
#ifdef CONFIG_PPC64
814819
paca_ptrs[cpu]->__current = idle;
815820
paca_ptrs[cpu]->kstack = (unsigned long)ti + THREAD_SIZE - STACK_FRAME_OVERHEAD;
821+
#ifdef CONFIG_STACKPROTECTOR
822+
paca_ptrs[cpu]->canary = idle->stack_canary;
823+
#endif
816824
#endif
817825
ti->cpu = cpu;
818826
secondary_ti = current_set[cpu] = ti;

0 commit comments

Comments
 (0)