From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5576C32771 for ; Mon, 20 Jan 2020 03:34:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A67412073D for ; Mon, 20 Jan 2020 03:34:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ozlabs.org header.i=@ozlabs.org header.b="J+bOs+Mo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729137AbgATDeM (ORCPT ); Sun, 19 Jan 2020 22:34:12 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:34613 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729015AbgATDeM (ORCPT ); Sun, 19 Jan 2020 22:34:12 -0500 Received: by ozlabs.org (Postfix, from userid 1003) id 481HMj2M00z9sRQ; Mon, 20 Jan 2020 14:34:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; t=1579491249; bh=6J0yPKo/kn+WbG/Jx05ZU6+6m/AlQNEvaTssDj+re3g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=J+bOs+MonJV9E7pI5lPc45XM0RCY2NjfQhio5m6/DttgJzWYQ3HNgH1xNUIV476t1 ts+G5ufVu2nlLxna51nc4RLV4i+BMxNIj8OtXWtlekVH++JUnEo50tNL+EcDdMfnkK 0tKNeAH0zTIwzwjt/ddygd75H6MloM9kMawF09dx8px7N8Z19MLfg0DZDiMcl7Jxj9 O7BDLwTM/8mWG+Mi5fGu3SEx+TpDcDN2c+ViWcUIssgNg+IQQZy1GA8JrmdTUkDUam B5LzqGm2UwjQc0vxq2SUD2N7ikcbM2cnwWO5UhkiGCsdd5z9MQlNdr+cIMYXi//Jw1 JWsmSqN7nCbMg== Date: Mon, 20 Jan 2020 14:00:41 +1100 From: Paul Mackerras To: Sean Christopherson Cc: Marc Zyngier , James Hogan , Christian Borntraeger , Janosch Frank , Paolo Bonzini , James Morse , Julien Thierry , Suzuki K Poulose , David Hildenbrand , Cornelia Huck , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kurz Subject: Re: [PATCH v2 02/45] KVM: PPC: Book3S PR: Free shared page if mmu initialization fails Message-ID: <20200120030041.GB14307@blackberry> References: <20191218215530.2280-1-sean.j.christopherson@intel.com> <20191218215530.2280-3-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191218215530.2280-3-sean.j.christopherson@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org 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 > Signed-off-by: Sean Christopherson > --- > 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