diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-04-28 11:12:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-28 11:12:19 -0700 |
| commit | c088d58b10cfefdd04bc5015f6185232fe4cb96d (patch) | |
| tree | c20931616831cfaa58e09db532ee3a09fce18b18 /arch | |
| parent | 81abee4ace68b96e4ba4928a75132343c2d0c2cd (diff) | |
| parent | 9a59cd54291278483ee1b52106167a25e7b65ddb (diff) | |
Merge "arm64: kasan: clear stale stack poison"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/sleep.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S index 5714f939c19b..b7c4b682bfc8 100644 --- a/arch/arm64/kernel/sleep.S +++ b/arch/arm64/kernel/sleep.S @@ -115,6 +115,10 @@ ENTRY(cpu_resume_mmu) ENDPROC(cpu_resume_mmu) .popsection cpu_resume_after_mmu: +#ifdef CONFIG_KASAN + mov x0, sp + bl kasan_unpoison_remaining_stack +#endif mov x0, #0 // return zero on success ret ENDPROC(cpu_resume_after_mmu) |