1 files changed, 8 insertions, 0 deletions

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 3a51ffca75e3..6fbfa5fff05d 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -132,6 +132,9 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
         /* Mark the initial VMID generation invalid */
         kvm->arch.vmid_gen = 0;
 
+        /* The maximum number of VCPUs is limited by the host's GIC model */
+        kvm->arch.max_vcpus = kvm_vgic_get_max_vcpus();
+
         return ret;
 out_free_stage2_pgd:
         kvm_free_stage2_pgd(kvm);
@@ -218,6 +221,11 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
                 goto out;
         }
 
+        if (id >= kvm->arch.max_vcpus) {
+                err = -EINVAL;
+                goto out;
+        }
+
         vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);
         if (!vcpu) {
                 err = -ENOMEM;