From: Marc Zyngier Date: Tue, 4 Dec 2018 17:11:19 +0000 (+0000) Subject: KVM: arm/arm64: vgic: Cap SPIs to the VM-defined maximum X-Git-Tag: v4.19.14~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6318b1b7c90cf60e2a64918734201edcc0e22b3e;p=platform%2Fkernel%2Flinux-rpi.git KVM: arm/arm64: vgic: Cap SPIs to the VM-defined maximum commit bea2ef803ade3359026d5d357348842bca9edcf1 upstream. SPIs should be checked against the VMs specific configuration, and not the architectural maximum. Cc: stable@vger.kernel.org Signed-off-by: Marc Zyngier Signed-off-by: Greg Kroah-Hartman --- diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c index 7cfdfbc..8ab0491 100644 --- a/virt/kvm/arm/vgic/vgic.c +++ b/virt/kvm/arm/vgic/vgic.c @@ -108,8 +108,8 @@ struct vgic_irq *vgic_get_irq(struct kvm *kvm, struct kvm_vcpu *vcpu, } /* SPIs */ - if (intid <= VGIC_MAX_SPI) { - intid = array_index_nospec(intid, VGIC_MAX_SPI); + if (intid < (kvm->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS)) { + intid = array_index_nospec(intid, kvm->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS); return &kvm->arch.vgic.spis[intid - VGIC_NR_PRIVATE_IRQS]; }