x86-traps-avoid-kmsan-bugs-originating-from-handle_bug.patch removed from -mm tree
The quilt patch titled
Subject: x86/traps: avoid KMSAN bugs originating from handle_bug()
has been removed from the -mm tree. Its filename was
x86-traps-avoid-kmsan-bugs-originating-from-handle_bug.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Alexander Potapenko <[email protected]>
Subject: x86/traps: avoid KMSAN bugs originating from handle_bug()
Date: Wed, 2 Nov 2022 12:06:11 +0100
There is a case in exc_invalid_op handler that is executed outside the irqentry_enter()/irqentry_exit() region when an UD2 instruction is used to encode a call to __warn().
In that case the struct pt_regs passed to the interrupt handler is never unpoisoned by KMSAN (this is normally done in irqentry_enter()), which leads to false positives inside handle_bug().
Use kmsan_unpoison_entry_regs() to explicitly unpoison those registers before using them.
---
arch/x86/kernel/traps.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/kernel/traps.c renamed from arch/x86/kernel/traps.c~x86-traps-avoid-kmsan-bugs-originating-from-handle_bug +7 -0
@@ -15,6 +15,7 @@#include <linux/context_tracking.h> #include <linux/interrupt.h> #include <linux/kallsyms.h> +#include <linux/kmsan.h> #include <linux/spinlock.h> #include <linux/kprobes.h> #include <linux/uaccess.h>
@@ -301,6 +302,12 @@ static noinstr bool handle_bug(struct pt {bool handled = false; +/* +* Normally @regs are unpoisoned by irqentry_enter(), but handle_bug() +* is a rare case that uses @regs without passing them to +* irqentry_enter(). +*/ +kmsan_unpoison_entry_regs (regs);if (!is_valid_bugaddr (regs->ip))return handled;
_
Patches currently in -mm which might be from [email protected] are