diff options
| author | Wei Yongjun <yjwei@cn.fujitsu.com> | 2010-01-22 14:21:29 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-28 15:02:48 -0800 |
| commit | 9801911326462a332d83eb508f1120bd45178426 (patch) | |
| tree | 5813ab28a6005f7aab52fd7060cad20290d38448 | |
| parent | 8e5c20d09b0003c91a96e35f7117633eefe2545a (diff) | |
| download | lwn-9801911326462a332d83eb508f1120bd45178426.tar.gz lwn-9801911326462a332d83eb508f1120bd45178426.zip | |
KVM: x86: Fix leak of free lapic date in kvm_arch_vcpu_init()
commit 443c39bc9ef7d8f648408d74c97e943f3bb3f48a upstream.
In function kvm_arch_vcpu_init(), if the memory malloc for
vcpu->arch.mce_banks is fail, it does not free the memory
of lapic date. This patch fixed it.
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | arch/x86/kvm/x86.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1bd161ed168a..6378e0742691 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4766,12 +4766,13 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) GFP_KERNEL); if (!vcpu->arch.mce_banks) { r = -ENOMEM; - goto fail_mmu_destroy; + goto fail_free_lapic; } vcpu->arch.mcg_cap = KVM_MAX_MCE_BANKS; return 0; - +fail_free_lapic: + kvm_free_lapic(vcpu); fail_mmu_destroy: kvm_mmu_destroy(vcpu); fail_free_pio_data: |