Skip to contentSkip to conversation

x86/entry/64: wipe KASAN stack shadow before rewind_stack_do_exit()

PATCH In review Jann Horn 3 participants 3 messages Aug 28, 2018 – Aug 30, 2018

Subsystems (2)
lore
Share & tools
lore

Jann Horn

author
#0 lore raw

PATCH v2 1/1 x86/entry/64: wipe KASAN stack shadow before rewind_stack_do_exit()

Reset the KASAN shadow state of the task stack before rewinding RSP. Without this, a kernel oops will leave parts of the stack poisoned, and code running under do_exit() can trip over such poisoned regions and cause nonsensical false-positive KASAN reports about stack-out-of-bounds bugs.

This patch does not wipe exception stacks; if you oops on an exception stack, you might get random KASAN false-positives from other tasks afterwards. This is probably relatively uninteresting, since if you're oopsing on an exception stack, you likely have bigger things to worry about. It'd be more interesting if vmapped stacks and KASAN were compatible, since then handle_stack_overflow() would oops from exception stack context.

Fixes 2deb4be28077 ("x86/dumpstack: When OOPSing, rewind the stack before do_exit()")

---
v2:
- Rewrite, do it in C from oops_end() instead of in assembly (Andrey Ryabinin)

 arch/x86/kernel/dumpstack.c | 4 ++++
 1 file changed, 4 insertions(+)
arch/x86/kernel/dumpstack.c +4 -0
index 9c8652974f8e..1596e6bfea6f 100644
@@ -17,6 +17,7 @@
 #include <linux/bug.h>
 #include <linux/nmi.h>
 #include <linux/sysfs.h>
+#include <linux/kasan.h>
 
 #include <asm/cpu_entry_area.h>
 #include <asm/stacktrace.h>
@@ -346,7 +347,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
 	 * We're not going to return, but we might be on an IST stack or
 	 * have very little stack space left.  Rewind the stack and kill
 	 * the task.
+	 * Before we rewind the stack, we have to tell KASAN that we're going to
+	 * reuse the task stack and that existing poisons are invalid.
 	 */
+	kasan_unpoison_task_stack(current);
 	rewind_stack_do_exit(signr);
 }
 NOKPROBE_SYMBOL(oops_end);
Signature · 1 line
2.19.0.rc0.228.g281dcd1b4d0-goog
Acked-by on v2 1/1
#1 lore raw
Quoted 13 lines · Jann Horn

Reset the KASAN shadow state of the task stack before rewinding RSP. Without this, a kernel oops will leave parts of the stack poisoned, and code running under do_exit() can trip over such poisoned regions and cause nonsensical false-positive KASAN reports about stack-out-of-bounds bugs.

This patch does not wipe exception stacks; if you oops on an exception stack, you might get random KASAN false-positives from other tasks afterwards. This is probably relatively uninteresting, since if you're oopsing on an exception stack, you likely have bigger things to worry about. It'd be more interesting if vmapped stacks and KASAN were compatible, since then handle_stack_overflow() would oops from exception stack context.

Quoted 3 lines
Fixes 2deb4be28077 ("x86/dumpstack: When OOPSing, rewind the stack before do_exit()")

---

#2 lore raw

[tip:x86/urgent] x86/entry/64: Wipe KASAN stack shadow before rewind_stack_do_exit()

In reply to Jann Horn
x86/entry/64: Wipe KASAN stack shadow before rewind_stack_do_exit()
Commit-ID:  f12d11c5c184626b4befdee3d573ec8237405a33
Gitweb:     https://git.kernel.org/tip/f12d11c5c184626b4befdee3d573ec8237405a33
Author:     Jann Horn <[email protected]>
AuthorDate: Tue, 28 Aug 2018 20:40:33 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Thu, 30 Aug 2018 11:37:09 +0200

x86/entry/64: Wipe KASAN stack shadow before rewind_stack_do_exit()

Reset the KASAN shadow state of the task stack before rewinding RSP. Without this, a kernel oops will leave parts of the stack poisoned, and code running under do_exit() can trip over such poisoned regions and cause nonsensical false-positive KASAN reports about stack-out-of-bounds bugs.

This does not wipe the exception stacks; if an oops happens on an exception stack, it might result in random KASAN false-positives from other tasks afterwards. This is probably relatively uninteresting, since if the kernel oopses on an exception stack, there are most likely bigger things to worry about. It'd be more interesting if vmapped stacks and KASAN were compatible, since then handle_stack_overflow() would oops from exception stack context.

Fixes 2deb4be28077 ("x86/dumpstack: When OOPSing, rewind the stack before do_exit()")
Cc Andy Lutomirski <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc Alexander Potapenko <[email protected]>
Cc Kees Cook <[email protected]>
---
 arch/x86/kernel/dumpstack.c | 4 ++++
 1 file changed, 4 insertions(+)
arch/x86/kernel/dumpstack.c +4 -0
index 9c8652974f8e..1596e6bfea6f 100644
@@ -17,6 +17,7 @@
 #include <linux/bug.h>
 #include <linux/nmi.h>
 #include <linux/sysfs.h>
+#include <linux/kasan.h>
 
 #include <asm/cpu_entry_area.h>
 #include <asm/stacktrace.h>
@@ -346,7 +347,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
 	 * We're not going to return, but we might be on an IST stack or
 	 * have very little stack space left.  Rewind the stack and kill
 	 * the task.
+	 * Before we rewind the stack, we have to tell KASAN that we're going to
+	 * reuse the task stack and that existing poisons are invalid.
 	 */
+	kasan_unpoison_task_stack(current);
 	rewind_stack_do_exit(signr);
 }
 NOKPROBE_SYMBOL(oops_end);