lkml.org 
[lkml]   [2008]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/54] KVM: Correct kvm_init() error paths not freeing bad_pge.
    Date
    From: Zhang Xiantao <xiantao.zhang@intel.com>

    Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    ---
    drivers/kvm/kvm_main.c | 28 +++++++++++++++-------------
    1 files changed, 15 insertions(+), 13 deletions(-)

    diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
    index ef961cc..b56ee34 100644
    --- a/drivers/kvm/kvm_main.c
    +++ b/drivers/kvm/kvm_main.c
    @@ -1311,7 +1311,7 @@ int kvm_init(void *opaque, unsigned int vcpu_size,

    r = kvm_arch_init(opaque);
    if (r)
    - goto out4;
    + goto out_fail;

    bad_page = alloc_page(GFP_KERNEL | __GFP_ZERO);

    @@ -1322,29 +1322,29 @@ int kvm_init(void *opaque, unsigned int vcpu_size,

    r = kvm_arch_hardware_setup();
    if (r < 0)
    - goto out;
    + goto out_free_0;

    for_each_online_cpu(cpu) {
    smp_call_function_single(cpu,
    kvm_arch_check_processor_compat,
    &r, 0, 1);
    if (r < 0)
    - goto out_free_0;
    + goto out_free_1;
    }

    on_each_cpu(hardware_enable, NULL, 0, 1);
    r = register_cpu_notifier(&kvm_cpu_notifier);
    if (r)
    - goto out_free_1;
    + goto out_free_2;
    register_reboot_notifier(&kvm_reboot_notifier);

    r = sysdev_class_register(&kvm_sysdev_class);
    if (r)
    - goto out_free_2;
    + goto out_free_3;

    r = sysdev_register(&kvm_sysdev);
    if (r)
    - goto out_free_3;
    + goto out_free_4;

    /* A kmem cache lets us meet the alignment requirements of fx_save. */
    kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size,
    @@ -1352,7 +1352,7 @@ int kvm_init(void *opaque, unsigned int vcpu_size,
    0, NULL);
    if (!kvm_vcpu_cache) {
    r = -ENOMEM;
    - goto out_free_4;
    + goto out_free_5;
    }

    kvm_chardev_ops.owner = module;
    @@ -1370,21 +1370,23 @@ int kvm_init(void *opaque, unsigned int vcpu_size,

    out_free:
    kmem_cache_destroy(kvm_vcpu_cache);
    -out_free_4:
    +out_free_5:
    sysdev_unregister(&kvm_sysdev);
    -out_free_3:
    +out_free_4:
    sysdev_class_unregister(&kvm_sysdev_class);
    -out_free_2:
    +out_free_3:
    unregister_reboot_notifier(&kvm_reboot_notifier);
    unregister_cpu_notifier(&kvm_cpu_notifier);
    -out_free_1:
    +out_free_2:
    on_each_cpu(hardware_disable, NULL, 0, 1);
    -out_free_0:
    +out_free_1:
    kvm_arch_hardware_unsetup();
    +out_free_0:
    + __free_page(bad_page);
    out:
    kvm_arch_exit();
    kvm_exit_debug();
    -out4:
    +out_fail:
    return r;
    }
    EXPORT_SYMBOL_GPL(kvm_init);
    --
    1.5.3.7


    \
     
     \ /
      Last update: 2008-01-01 16:47    [W:4.120 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site