Commit 62788b0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux 

Pull ARM fix from Russell King:

 - clear stale KASan stack poison when a CPU resumes

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux:
  ARM: 9381/1: kasan: clear stale stack poison
parents 1bbc9915 c4238686

arch/arm/kernel/sleep.S

+4 −0
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@ cpu_resume_after_mmu: 
	instr_sync

#endif

	bl	cpu_init		@ restore the und/abt/irq banked regs

#if defined(CONFIG_KASAN) && defined(CONFIG_KASAN_STACK)

	mov	r0, sp

	bl	kasan_unpoison_task_stack_below

#endif

	mov	r0, #0			@ return zero on success

	ldmfd	sp!, {r4 - r11, pc}

ENDPROC(cpu_resume_after_mmu)