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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 CE24AC35641 for ; Fri, 21 Feb 2020 08:00:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AEF824656 for ; Fri, 21 Feb 2020 08:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582272059; bh=dkc3DcPnSfReoLTVZWTryE+VHvgOIvMyhzYaUJQ6280=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JDMXA13K7TLSAOyKtUOfcOeWJSGyV081RPKLUwhLQQOKLNMbu/u5maXjKiVuBlrlQ pAmHzvI4uBgGoGiF18SAn2yL8UXTNA2/gfXEs8rv2iLD8wjzK3re9zoWRGubZOLJOS MsEy0IX4qJ41aSduw3T2sejsMVo1tkiVMeKCbbHQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731135AbgBUIA6 (ORCPT ); Fri, 21 Feb 2020 03:00:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:33094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731124AbgBUIAw (ORCPT ); Fri, 21 Feb 2020 03:00:52 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 DB3AD222C4; Fri, 21 Feb 2020 08:00:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582272051; bh=dkc3DcPnSfReoLTVZWTryE+VHvgOIvMyhzYaUJQ6280=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cEiYJZ3WOZdkoA+IoMLN918codmGpjmeEECsvKecYVlJKMW8JAsOgBjcjvp/YdqIs laDaCq8oKSBmrl6qCuIwjelps8yxxNTYCaX22xBn5ktqIhuq7u88YJBdb8GmdZaH0q tPN3OS1lswUxqG1yJosJlh1jnTFYaL9rHX0eH6BY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bharata B Rao , Kamalesh Babulal , Paul Mackerras , Sasha Levin Subject: [PATCH 5.5 360/399] KVM: PPC: Book3S HV: Release lock on page-out failure path Date: Fri, 21 Feb 2020 08:41:25 +0100 Message-Id: <20200221072435.741813944@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072402.315346745@linuxfoundation.org> References: <20200221072402.315346745@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bharata B Rao [ Upstream commit e032e3b55b6f487e48c163c5dca74086f147a169 ] When migrate_vma_setup() fails in kvmppc_svm_page_out(), release kvm->arch.uvmem_lock before returning. Fixes: ca9f4942670 ("KVM: PPC: Book3S HV: Support for running secure guests") Signed-off-by: Bharata B Rao Reviewed-by: Kamalesh Babulal Signed-off-by: Paul Mackerras Signed-off-by: Sasha Levin --- arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c index 2de264fc31563..5914fbfa5e0a7 100644 --- a/arch/powerpc/kvm/book3s_hv_uvmem.c +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c @@ -543,7 +543,7 @@ kvmppc_svm_page_out(struct vm_area_struct *vma, unsigned long start, ret = migrate_vma_setup(&mig); if (ret) - return ret; + goto out; spage = migrate_pfn_to_page(*mig.src); if (!spage || !(*mig.src & MIGRATE_PFN_MIGRATE)) -- 2.20.1