Patch "arm/arm64: KVM: Don't allow creating VCPUs after vgic_initialized" has been added to the 3.14-stable tree

[<gregkh@linuxfoundation.org>]

This is a note to let you know that I've just added the patch titled

    arm/arm64: KVM: Don't allow creating VCPUs after vgic_initialized

to the 3.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-arm64-kvm-don-t-allow-creating-vcpus-after-vgic_initialized.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 716139df2517fbc3f2306dbe8eba0fa88dca0189 Mon Sep 17 00:00:00 2001
From: Christoffer Dall <christoffer.dall@linaro.org>
Date: Tue, 9 Dec 2014 14:33:45 +0100
Subject: arm/arm64: KVM: Don't allow creating VCPUs after vgic_initialized

From: Christoffer Dall <christoffer.dall@linaro.org>

commit 716139df2517fbc3f2306dbe8eba0fa88dca0189 upstream.

When the vgic initializes its internal state it does so based on the
number of VCPUs available at the time.  If we allow KVM to create more
VCPUs after the VGIC has been initialized, we are likely to error out in
unfortunate ways later, perform buffer overflows etc.

Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Eric Auger <eric.auger@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/arm/kvm/arm.c |    5 +++++
 1 file changed, 5 insertions(+)

--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -220,6 +220,11 @@ struct kvm_vcpu *kvm_arch_vcpu_create(st
 	int err;
 	struct kvm_vcpu *vcpu;
 
+	if (irqchip_in_kernel(kvm) && vgic_initialized(kvm)) {
+		err = -EBUSY;
+		goto out;
+	}
+
 	vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);
 	if (!vcpu) {
 		err = -ENOMEM;


Patches currently in stable-queue which might be from christoffer.dall@linaro.org are

queue-3.14/arm-arm64-kvm-ensure-memslots-are-within-kvm_phys_size.patch
queue-3.14/arm-arm64-kvm-don-t-clear-the-vcpu_power_off-flag.patch
queue-3.14/arm-arm64-kvm-correct-kvm_arm_vcpu_init-power-off-option.patch
queue-3.14/arm-arm64-kvm-don-t-allow-creating-vcpus-after-vgic_initialized.patch
queue-3.14/arm-arm64-kvm-fix-potential-null-dereference-in.patch
queue-3.14/arm64-kvm-fix-unmapping-with-48-bit-vas.patch
queue-3.14/arm-arm64-kvm-fix-set_clear_sgi_pend_reg-offset.patch
queue-3.14/arm-kvm-strict_mm_typechecks-fix-for-user_mem_abort.patch
queue-3.14/arm-arm64-kvm-fix-use-of-wnr-bit-in-kvm_is_write_fault.patch
queue-3.14/arm-kvm-fix-cpu-hotplug.patch
queue-3.14/arm-arm64-kvm-fix-vttbr_baddr_mask-and-pgd-alloc.patch
queue-3.14/arm-arm64-kvm-introduce-stage2_unmap_vm.patch
queue-3.14/arm-arm64-kvm-vgic-fix-error-code-in-kvm_vgic_create.patch
queue-3.14/kvm-arm-vgic-plug-irq-injection-race.patch
queue-3.14/arm-arm64-kvm-reset-the-hcr-on-each-vcpu-when-resetting-the.patch