Commit 585bb8f9 authored Nov 11, 2015 by James Hogan Committed by Paolo Bonzini Nov 18, 2015

MIPS: KVM: Uninit VCPU in vcpu_create error path

If either of the memory allocations in kvm_arch_vcpu_create() fail, the
vcpu which has been allocated and kvm_vcpu_init'd doesn't get uninit'd
in the error handling path. Add a call to kvm_vcpu_uninit() to fix this.

Fixes: 669e846e ("KVM/MIPS32: MIPS arch specific APIs for KVM")
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Cc: <stable@vger.kernel.org> # 3.10.x-
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent c5c2a3b9

arch/mips/kvm/mips.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -279,7 +279,7 @@ struct kvm_vcpu kvm_arch_vcpu_create(struct kvm kvm, unsigned int id)

		if (!gebase) {
		err = -ENOMEM;
		goto out_free_cpu;
		goto out_uninit_cpu;
		}
		kvm_debug("Allocated %d bytes for KVM Exception Handlers @ %p\n",
		ALIGN(size, PAGE_SIZE), gebase);
		@@ -343,6 +343,9 @@ struct kvm_vcpu kvm_arch_vcpu_create(struct kvm kvm, unsigned int id)
		out_free_gebase:
		kfree(gebase);

		out_uninit_cpu:
		kvm_vcpu_uninit(vcpu);

		out_free_cpu:
		kfree(vcpu);