KVM: fix memoryleak in kvm_init()
authorMiaohe Lin <linmiaohe@huawei.com>
Tue, 23 Aug 2022 06:34:14 +0000 (14:34 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Mar 2023 07:49:04 +0000 (08:49 +0100)
commit 5a2a961be2ad6a16eb388a80442443b353c11d16 upstream.

When alloc_cpumask_var_node() fails for a certain cpu, there might be some
allocated cpumasks for percpu cpu_kick_mask. We should free these cpumasks
or memoryleak will occur.

Fixes: baff59ccdc65 ("KVM: Pre-allocate cpumasks for kvm_make_all_cpus_request_except()")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Link: https://lore.kernel.org/r/20220823063414.59778-1-linmiaohe@huawei.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
virt/kvm/kvm_main.c

index 17e22c654c4e46ceb35f09dae930b0fe709a2132..1cb2530831f41db1c10c223202c1bb6fe21a3917 100644 (file)
@@ -5649,7 +5649,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
 
        r = kvm_async_pf_init();
        if (r)
-               goto out_free_5;
+               goto out_free_4;
 
        kvm_chardev_ops.owner = module;
        kvm_vm_fops.owner = module;
@@ -5682,10 +5682,9 @@ err_register:
        kvm_vfio_ops_exit();
 err_vfio:
        kvm_async_pf_deinit();
-out_free_5:
+out_free_4:
        for_each_possible_cpu(cpu)
                free_cpumask_var(per_cpu(cpu_kick_mask, cpu));
-out_free_4:
        kmem_cache_destroy(kvm_vcpu_cache);
 out_free_3:
        unregister_reboot_notifier(&kvm_reboot_notifier);