diff options
| author | James Hogan | 2015-11-11 15:21:20 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2015-11-18 12:25:36 +0100 |
| commit | 585bb8f9a5e592f2ce7abbe5ed3112d5438d2754 (patch) | |
| tree | c3956a07028c38756b7434435f60017ab389bc1d /arch/mips/kvm/mips.c | |
| parent | MIPS: KVM: Fix CACHE immediate offset sign extension (diff) | |
| download | kernel-qcow2-linux-585bb8f9a5e592f2ce7abbe5ed3112d5438d2754.tar.gz kernel-qcow2-linux-585bb8f9a5e592f2ce7abbe5ed3112d5438d2754.tar.xz kernel-qcow2-linux-585bb8f9a5e592f2ce7abbe5ed3112d5438d2754.zip | |
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: 669e846e6c4e ("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>
Diffstat (limited to 'arch/mips/kvm/mips.c')
| -rw-r--r-- | arch/mips/kvm/mips.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index 49ff3bfc007e..b9b803facdbf 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -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); |