| Message ID | 20191218215530.2280-3-sean.j.christopherson@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: Refactor vCPU creation | expand |
On Wed, Dec 18, 2019 at 01:54:47PM -0800, Sean Christopherson wrote: > 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> > --- > arch/powerpc/kvm/book3s_pr.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c > index ce4fcf76e53e..26ca62b6d773 100644 > --- a/arch/powerpc/kvm/book3s_pr.c > +++ b/arch/powerpc/kvm/book3s_pr.c > @@ -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: > -- > 2.24.1 Looks correct. Acked-by: Paul Mackerras <paulus@ozlabs.org>
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index ce4fcf76e53e..26ca62b6d773 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -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:
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> --- arch/powerpc/kvm/book3s_pr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)