Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp5016191ybg; Mon, 21 Oct 2019 19:05:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqw/Pux8dBqaUmZTN5fxw+RNEWHXyRvhQ88ZzdcF3UEw/AgvYi1Dk+dZDpkQv0zvfStRq3vI X-Received: by 2002:a17:906:160f:: with SMTP id m15mr24257819ejd.217.1571709939758; Mon, 21 Oct 2019 19:05:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571709939; cv=none; d=google.com; s=arc-20160816; b=wxkb63+s/KirG9zRQ1HwBHkCNHawjK0zF+RurfJP3H+XRzap+LWG+sbY9llz/NezW6 3oMIoTKs3LyIz2E9jemayDWc2/VHqq6LRHBPIpslmN2Q2q+7pFH4czPBcJ5bKl7tGau4 bszJOE0LWiIQa8YOunKRTmz+3SnHKbsdDDBj1DcwYgj3WNFvrOqTzlLp3UXif0Fqb1k7 GYHUyH5AQRBczy5ACHVM0WEdWIjVIYN/h7y/62GjDlOpiP6hERfdv8qVIJLBUO3LlEjb NutkS67WGhd/7UmR39kjxm9iLHQlcQryTpCzJzyIpYy6AB5WiCklyFPARfbwSG3Lmigm /v9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ZqkRRmmSuRAZRsvnLmVpBhp/LZdL9EtxPegFF7Acrmc=; b=U9l/FXIff8/Ik07/zjPXSHlZb21JPjLv/bv5eeyzkOn60zpfDQML6PU6YbgPRAmKPP ELkLosKBLc7QR2fRi3YZUflEu805BJOQUZxRHa0Bdn1iS6atzcjnfL/OxA7/3Xmh7APK D+oEtudzwtwKzourH1FbETQ+9tyW9ABsHAHqtODGYN/3YNIVdzWxbxxIJbZKQsjxsxwf K/sv5wCptUjuVDORIWTcbijJhu8ohZ2/SJI5nIqN2GpUKm++mVhMw1ls8ZVnkAXGnp8J lRTScOd7iz3DdThFf17luy5uV8ysAyKlhkuCqopzVDy7YxPrFUORl3nobMXCGHDqo8wd HBJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w13si10889504edx.361.2019.10.21.19.05.16; Mon, 21 Oct 2019 19:05:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730905AbfJVCDy (ORCPT + 99 others); Mon, 21 Oct 2019 22:03:54 -0400 Received: from mga14.intel.com ([192.55.52.115]:61583 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727953AbfJVB7d (ORCPT ); Mon, 21 Oct 2019 21:59:33 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Oct 2019 18:59:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,325,1566889200"; d="scan'208";a="196293747" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.41]) by fmsmga008.fm.intel.com with ESMTP; 21 Oct 2019 18:59:32 -0700 From: Sean Christopherson To: Marc Zyngier , James Hogan , Paul Mackerras , Christian Borntraeger , Janosch Frank , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: James Morse , Julien Thierry , Suzuki K Poulose , David Hildenbrand , Cornelia Huck , Sean Christopherson , 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 Subject: [PATCH 02/45] KVM: PPC: Book3S PR: Free shared page if mmu initialization fails Date: Mon, 21 Oct 2019 18:58:42 -0700 Message-Id: <20191022015925.31916-3-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20191022015925.31916-1-sean.j.christopherson@intel.com> References: <20191022015925.31916-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 cc65af8fe6f7..3f6ad3f58628 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -1769,10 +1769,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.22.0