Commit 71afaba4 authored Jul 08, 2014 by Marc Zyngier Committed by Christoffer Dall Sep 18, 2014

KVM: ARM: vgic: plug irq injection race

As it stands, nothing prevents userspace from injecting an interrupt
before the guest's GIC is actually initialized.

This goes unnoticed so far (as everything is pretty much statically
allocated), but ends up exploding in a spectacular way once we switch
to a more dynamic allocation (the GIC data structure isn't there yet).

The fix is to test for the "ready" flag in the VGIC distributor before
trying to inject the interrupt. Note that in order to avoid breaking
userspace, we have to ignore what is essentially an error.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>

parent 7e362919

virt/kvm/arm/vgic.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1585,7 +1585,8 @@ out:
		int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num,
		bool level)
		{
		if (vgic_update_irq_pending(kvm, cpuid, irq_num, level))
		if (likely(vgic_initialized(kvm)) &&
		vgic_update_irq_pending(kvm, cpuid, irq_num, level))
		vgic_kick_vcpus(kvm);

		return 0;

Admin message