diff options
| author |   Andre Przywara <andre.przywara@arm.com> | 2017-11-17 17:58:21 +0000 |
|---|---|---|
| committer |   Christoffer Dall <christoffer.dall@linaro.org> | 2017-11-29 16:46:10 +0100 |
| commit | 285a90e36b138b707c4a9850f2500774b7191c99 (patch) | |
| tree | 6c230122f28c33255833360966915a254f2c4828 /virt | |
| parent | KVM: arm/arm64: Don't enable/disable physical timer access on VHE (diff) | |
| download | linux-dev-285a90e36b138b707c4a9850f2500774b7191c99.tar.xz linux-dev-285a90e36b138b707c4a9850f2500774b7191c99.zip | |
KVM: arm/arm64: VGIC: extend !vgic_is_initialized guard
Commit f39d16cbabf9 ("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: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c index b168a328a9e0..786cce7bd2ec 100644 --- a/virt/kvm/arm/vgic/vgic.c +++ b/virt/kvm/arm/vgic/vgic.c @@ -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); |