KVM: Clean up error handling during VCPU creation

So far kvm_arch_vcpu_setup is responsible for freeing the vcpu struct if
it fails. Move this confusing resonsibility back into the hands of
kvm_vm_ioctl_create_vcpu. Only kvm_arch_vcpu_setup of x86 is affected,
all other archs cannot fail.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 087b3f8ca46e..fa2321ac77cc 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1615,18 +1615,18 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)
 
         r = kvm_arch_vcpu_setup(vcpu);
         if (r)
-                return r;
+                goto vcpu_destroy;
 
         mutex_lock(&kvm->lock);
         if (atomic_read(&kvm->online_vcpus) == KVM_MAX_VCPUS) {
                 r = -EINVAL;
-                goto vcpu_destroy;
+                goto unlock_vcpu_destroy;
         }
 
         kvm_for_each_vcpu(r, v, kvm)
                 if (v->vcpu_id == id) {
                         r = -EEXIST;
-                        goto vcpu_destroy;
+                        goto unlock_vcpu_destroy;
                 }
 
         BUG_ON(kvm->vcpus[atomic_read(&kvm->online_vcpus)]);
@@ -1636,7 +1636,7 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)
         r = create_vcpu_fd(vcpu);
         if (r < 0) {
                 kvm_put_kvm(kvm);
-                goto vcpu_destroy;
+                goto unlock_vcpu_destroy;
         }
 
         kvm->vcpus[atomic_read(&kvm->online_vcpus)] = vcpu;
@@ -1650,8 +1650,9 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)
         mutex_unlock(&kvm->lock);
         return r;
 
-vcpu_destroy:
+unlock_vcpu_destroy:
         mutex_unlock(&kvm->lock);
+vcpu_destroy:
         kvm_arch_vcpu_destroy(vcpu);
         return r;
 }