Commit bea2ef80 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm/arm64: vgic: Cap SPIs to the VM-defined maximum 



SPIs should be checked against the VMs specific configuration, and
not the architectural maximum.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 6992195c

virt/kvm/arm/vgic/vgic.c

+2 −2
Original line number Diff line number Diff line
@@ -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];

	}