History

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.

Nicholas Piggin committed 3 years ago

Commit 2ea31e21 parent 97e45d41 file · +4 −2Browse files

Unified · Split

arch/powerpc/kernel/interrupt.c+4−2
@@ -50,16 +50,18 @@ static inline bool exit_must_hard_disable(void) · 49 unmodified lines
50 */50 */
51static notrace __always_inline bool prep_irq_for_enabled_exit(bool restartable)51static notrace __always_inline bool prep_irq_for_enabled_exit(bool restartable)
52{52{
53 bool must_hard_disable = (exit_must_hard_disable() || !restartable);
54
53 /* This must be done with RI=1 because tracing may touch vmaps */55 /* This must be done with RI=1 because tracing may touch vmaps */
54 trace_hardirqs_on();56 trace_hardirqs_on();
55 57
56 if (exit_must_hard_disable() || !restartable)58 if (must_hard_disable)
57 __hard_EE_RI_disable();59 __hard_EE_RI_disable();
58 60
59#ifdef CONFIG_PPC6461#ifdef CONFIG_PPC64
60 /* This pattern matches prep_irq_for_idle */62 /* This pattern matches prep_irq_for_idle */
61 if (unlikely(lazy_irq_pending_nocheck())) {63 if (unlikely(lazy_irq_pending_nocheck())) {
62 if (exit_must_hard_disable() || !restartable) {64 if (must_hard_disable) {
63 local_paca->irq_happened |= PACA_IRQ_HARD_DIS;65 local_paca->irq_happened |= PACA_IRQ_HARD_DIS;
64 __hard_RI_enable();66 __hard_RI_enable();
65 }67 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t