]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
KVM: PPC: Book3S PR: Free shared page if mmu initialization fails
authorSean Christopherson <sean.j.christopherson@intel.com>
Wed, 18 Dec 2019 21:54:47 +0000 (13:54 -0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 24 Jan 2020 08:18:52 +0000 (09:18 +0100)
Explicitly free the shared page if kvmppc_mmu_init() fails during
kvmppc_core_vcpu_create(), as the page is freed only in
kvmppc_core_vcpu_free(), which is not reached via kvm_vcpu_uninit().

Fixes: 96bc451a15329 ("KVM: PPC: Introduce shared page")
Cc: stable@vger.kernel.org
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Acked-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/powerpc/kvm/book3s_pr.c

index ce4fcf76e53e919d622296f8bf4d0369e50cc701..26ca62b6d773034769433c3720968ccfe61e8ab7 100644 (file)
@@ -1806,10 +1806,12 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm,
 
        err = kvmppc_mmu_init(vcpu);
        if (err < 0)
-               goto uninit_vcpu;
+               goto free_shared_page;
 
        return vcpu;
 
+free_shared_page:
+       free_page((unsigned long)vcpu->arch.shared);
 uninit_vcpu:
        kvm_vcpu_uninit(vcpu);
 free_shadow_vcpu: