Skip to content

Commit 2ea31e2

Browse files
npigginmpe
authored andcommitted
powerpc/64s/interrupt: Fix interrupt exit race with security mitigation switch
The RFI and STF security mitigation options can flip the interrupt_exit_not_reentrant static branch condition concurrently with the interrupt exit code which tests that branch. Interrupt exit tests this condition to set MSR[EE|RI] for exit, then again in the case a soft-masked interrupt is found pending, to recover the MSR so the interrupt can be replayed before attempting to exit again. If the condition changes between these two tests, the MSR and irq soft-mask state will become corrupted, leading to warnings and possible crashes. For example, if the branch is initially true then false, MSR[EE] will be 0 but PACA_IRQ_HARD_DIS clear and EE may not get enabled, leading to warnings in irq_64.c. Fixes: 1379974 ("powerpc/64: use interrupt restart table to speed up return from interrupt") Cc: [email protected] # v5.14+ Reported-by: Sachin Sant <[email protected]> Tested-by: Sachin Sant <[email protected]> Signed-off-by: Nicholas Piggin <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 97e45d4 commit 2ea31e2

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

arch/powerpc/kernel/interrupt.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,18 @@ static inline bool exit_must_hard_disable(void)
5050
*/
5151
static notrace __always_inline bool prep_irq_for_enabled_exit(bool restartable)
5252
{
53+
bool must_hard_disable = (exit_must_hard_disable() || !restartable);
54+
5355
/* This must be done with RI=1 because tracing may touch vmaps */
5456
trace_hardirqs_on();
5557

56-
if (exit_must_hard_disable() || !restartable)
58+
if (must_hard_disable)
5759
__hard_EE_RI_disable();
5860

5961
#ifdef CONFIG_PPC64
6062
/* This pattern matches prep_irq_for_idle */
6163
if (unlikely(lazy_irq_pending_nocheck())) {
62-
if (exit_must_hard_disable() || !restartable) {
64+
if (must_hard_disable) {
6365
local_paca->irq_happened |= PACA_IRQ_HARD_DIS;
6466
__hard_RI_enable();
6567
}

0 commit comments

Comments
 (0)