powerpc/64s/interrupt: Fix check_return_regs_valid false positive
Nicholas Piggin
reviewerPATCH 1/1 powerpc/64s/interrupt: Fix check_return_regs_valid false positive
The check_return_regs_valid can cause a false positive if the return regs are marked as norestart and they are an HSRR type interrupt, because the low bit in the bottom of regs->trap causes interrupt type matching to fail.
This can occcur for example on bare metal with a HV privileged doorbell interrupt that causes a signal, but do_signal returns early because get_signal() fails, and takes the "No signal to deliver" path. In this case no signal was delivered so the return location is not changed so return SRRs are not invalidated, yet set_trap_norestart is called, which messes up the match. Building go-1.16.6 is known to reproduce this.
Fix it by using the TRAP() accessor which masks out the low bit.
--- arch/powerpc/kernel/interrupt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/interrupt.c +1 -1
@@ -266,7 +266,7 @@ static void check_return_regs_valid(struct pt_regs *regs)if (trap_is_scv (regs))return ; - trap = regs->trap; + trap =TRAP (regs);// EE in HV mode sets HSRRs like 0xea0 if (cpu_has_feature (CPU_FTR_HVMODE ) && trap ==INTERRUPT_EXTERNAL ) trap =0xea0 ;
Signature · 1 line
2.23.0
Michael Ellerman
AppliedQuoted 5 lines · Nicholas Piggin
The
check_return_regs_validcan cause a false positive if the return regs are marked as norestart and they are an HSRR type interrupt, because the low bit in the bottom ofregs->trapcauses interrupt type matching to fail.
Quoted 8 lines
This can occcur for example on bare metal with a HV privileged doorbell interrupt that causes a signal, but
do_signalreturns early becauseget_signal()fails, and takes the "No signal to deliver" path. In this case no signal was delivered so the return location is not changed so return SRRs are not invalidated, yetset_trap_norestartis called, which messes up the match. Building go-1.16.6 is known to reproduce this.[...]
Applied to powerpc/next.
[1/1] powerpc/64s/interrupt: Fix check_return_regs_valid false positive
https://git.kernel.org/powerpc/c/4a5cb51f3db4be547225a4bce7a43d41b231382b
cheers