x86/traps: move kmsan check after instrumentation_begin

[ Upstream commit 1db272864ff250b5e607283eaec819e1186c8e26 ]

During x86_64 kernel build with CONFIG_KMSAN, the objtool warns following:

  AR      built-in.a
  AR      vmlinux.a
  LD      vmlinux.o
vmlinux.o: warning: objtool: handle_bug+0x4: call to
    kmsan_unpoison_entry_regs() leaves .noinstr.text section
  OBJCOPY modules.builtin.modinfo
  GEN     modules.builtin
  MODPOST Module.symvers
  CC      .vmlinux.export.o

Moving kmsan_unpoison_entry_regs() _after_ instrumentation_begin() fixes
the warning.

There is decode_bug(regs->ip, &imm) is left before KMSAN unpoisoining, but
it has the return condition and if we include it after
instrumentation_begin() it results the warning "return with
instrumentation enabled", hence, I'm concerned that regs will not be KMSAN
unpoisoned if `ud_type == BUG_NONE` is true.

Link: https://lkml.kernel.org/r/20241016152407.3149001-1-snovitoll@gmail.com
Fixes: ba54d194f8da ("x86/traps: avoid KMSAN bugs originating from handle_bug()")
Signed-off-by: Sabyrzhan Tasbolatov <snovitoll@gmail.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 840a3b2d24779c8c8f7f723f36ca1874c9507e87..37b8e20c03a9fe0d8434cd56cdd5c2a4beab5401 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -259,12 +259,6 @@ static noinstr bool handle_bug(struct pt_regs *regs)
        int ud_type;
        u32 imm;
 
-       /*
-        * 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);
        ud_type = decode_bug(regs->ip, &imm);
        if (ud_type == BUG_NONE)
                return handled;
@@ -273,6 +267,12 @@ static noinstr bool handle_bug(struct pt_regs *regs)
         * All lies, just get the WARN/BUG out.
         */
        instrumentation_begin();
+       /*
+        * 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);
        /*
         * Since we're emulating a CALL with exceptions, restore the interrupt
         * state to what it was at the exception site.