powerpc/mce: ensure machine check handler always tests RI

A machine check that is handled must still check MSR[RI] for
recoverability of the interrupted context. Without this patch
it's possible for a handled machine check to return to a
context where it has clobbered live registers.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210130130852.2952424-25-npiggin@gmail.com

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index f9ef183a5454911366f04f196bf2c7e09f2305f3..3a8699995a77946814fa5625486f69030f8ecc37 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -846,11 +846,11 @@ void machine_check_exception(struct pt_regs *regs)
 
        die_mce("Machine check", regs, SIGBUS);
 
+bail:
        /* Must die if the interrupt is not recoverable */
        if (!(regs->msr & MSR_RI))
                die_mce("Unrecoverable Machine check", regs, SIGBUS);
 
-bail:
        if (nmi) nmi_exit();
 }
 NOKPROBE_SYMBOL(machine_check_exception);