Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 285a90e3 authored by Andre Przywara's avatar Andre Przywara Committed by Christoffer Dall
Browse files

KVM: arm/arm64: VGIC: extend !vgic_is_initialized guard 



Commit f39d16cb ("KVM: arm/arm64: Guard kvm_vgic_map_is_active against
!vgic_initialized") introduced a check whether the VGIC has been
initialized before accessing the spinlock and the VGIC data structure.
However the vgic_get_irq() call in the variable declaration sneaked
through the net, so lets make sure that this also gets called only after
we actually allocated the arrays this function accesses.

Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent ec6449a9

virt/kvm/arm/vgic/vgic.c

+2 −1
Original line number Diff line number Diff line
@@ -823,13 +823,14 @@ void vgic_kick_vcpus(struct kvm *kvm) 


bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int vintid)

{

	struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, vintid);

	struct vgic_irq *irq;

	bool map_is_active;

	unsigned long flags;



	if (!vgic_initialized(vcpu->kvm))

		return false;



	irq = vgic_get_irq(vcpu->kvm, vcpu, vintid);

	spin_lock_irqsave(&irq->irq_lock, flags);

	map_is_active = irq->hw && irq->active;

	spin_unlock_irqrestore(&irq->irq_lock, flags);