Skip to contentSkip to conversation

KVM: x86: WARN and fail kvm_set_irq() if a PIC or I/O APIC vector is invalid

PATCH Applied Sean Christopherson 3 participants 3 messages Jun 18 – Jun 24

Subsystems (3)
lore
Share & tools
lore

Sean Christopherson

author maintainer
#0 lore raw

PATCH 1/1 KVM: x86: WARN and fail kvm_set_irq() if a PIC or I/O APIC vector is invalid

WARN and return an error up the stack if the PIC or I/O APIC encounters an invalid vector when injecting an IRQ, as there is no danger to the host and thus no justification for potentially panicking the kernel. Don't bug the VM either, as the risk of corrupting the guest is minuscule, and the guest might even be completely tolerant of a lost interrupt.

---
 arch/x86/kvm/i8259.c  | 3 ++-
 arch/x86/kvm/ioapic.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/kvm/i8259.c +2 -1
index 59e28c45d7dc..6a942ac622d5 100644
@@ -194,7 +194,8 @@ int kvm_pic_set_irq(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm,
 	int irq = e->irqchip.pin;
 	int ret, irq_level;
 
-	BUG_ON(irq < 0 || irq >= PIC_NUM_PINS);
+	if (WARN_ON_ONCE(irq < 0 || irq >= PIC_NUM_PINS))
+		return -1;
 
 	pic_lock(s);
 	irq_level = __kvm_irq_line_state(&s->irq_states[irq],
arch/x86/kvm/ioapic.c +2 -1
index f3f4a483ca15..88bd226f3b73 100644
@@ -504,7 +504,8 @@ int kvm_ioapic_set_irq(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm,
 	int irq = e->irqchip.pin;
 	int ret, irq_level;
 
-	BUG_ON(irq < 0 || irq >= IOAPIC_NUM_PINS);
+	if (WARN_ON_ONCE(irq < 0 || irq >= IOAPIC_NUM_PINS))
+		return -1;
 
 	spin_lock(&ioapic->lock);
 	irq_level = __kvm_irq_line_state(&ioapic->irq_states[irq],

base-commit: 9d4853b044beefa21c4ee3e18c40653601a64ced

Signature · 1 line
2.55.0.rc0.738.g0c8ab3ebcc-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Sean Christopherson

WARN and return an error up the stack if the PIC or I/O APIC encounters an invalid vector when injecting an IRQ, as there is no danger to the host and thus no justification for potentially panicking the kernel. Don't bug the VM either, as the risk of corrupting the guest is minuscule, and the guest might even be completely tolerant of a lost interrupt.