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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 0F9C3C2BA83 for ; Thu, 13 Feb 2020 15:55:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CDADA217F4 for ; Thu, 13 Feb 2020 15:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581609344; bh=nmHHeJv0jxAv944SVEIlCzmf1RpyAVWuyx6keZbVcjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g7NsxV1JhUVkTf2b8AwE3R39vC/bodwO8MRzHH/RdWWXQEtW6JoRxNHP6UHpm3vP6 9rGg93PtYgYC7tfO8eLu3aRcfiavxiRgFBeqjY1oMPCaEUuiQKMWgGkBP7N61ALvtF DJskjet3gwPBymytk0QiXAVxTyepqvDgl/NDMlS0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728549AbgBMPZe (ORCPT ); Thu, 13 Feb 2020 10:25:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:41422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387458AbgBMPZe (ORCPT ); Thu, 13 Feb 2020 10:25:34 -0500 Received: from localhost (unknown [104.132.1.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C4B8324691; Thu, 13 Feb 2020 15:25:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607533; bh=nmHHeJv0jxAv944SVEIlCzmf1RpyAVWuyx6keZbVcjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YSe3Q05KbXacXYmuj3lyqRM4C/rEHgAzmke+Yl/tyaovQRonKFzIfKVoDlNWL/TFd rO9eh99llk7VlD1KkyOpJfRKqzScqIfsDdTa8nJUyEMPIcFcxHe6j55uX0NmgMnmqt g0lX3qA4hY03G6Bj+PBslYyy/35PPfTcJahVM7N4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Greg Kurz , Sean Christopherson , Paul Mackerras , Paolo Bonzini Subject: [PATCH 4.14 090/173] KVM: PPC: Book3S PR: Free shared page if mmu initialization fails Date: Thu, 13 Feb 2020 07:19:53 -0800 Message-Id: <20200213151955.787342894@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151931.677980430@linuxfoundation.org> References: <20200213151931.677980430@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sean Christopherson commit cb10bf9194f4d2c5d830eddca861f7ca0fecdbb4 upstream. 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 Acked-by: Paul Mackerras Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kvm/book3s_pr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -1482,10 +1482,12 @@ static struct kvm_vcpu *kvmppc_core_vcpu 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: