diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-09 08:44:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-09 08:44:13 -0700 |
| commit | 62788b0f225da1837ad38101112e2c49123470ee (patch) | |
| tree | 93cb2fd1a839be0242544c85d01d94cedeb5201a | |
| parent | 1bbc99158504a335cf150d070c76f7edef4ed45d (diff) | |
| parent | c4238686f9093b98bd6245a348bcf059cdce23af (diff) | |
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
| -rw-r--r-- | arch/arm/kernel/sleep.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index a86a1d4f3461..93afd1005b43 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -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) |