From patchwork Tue Oct 27 13:53:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 307017 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=-12.8 required=3.0 tests=BAYES_00,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=ham 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 C668AC55179 for ; Tue, 27 Oct 2020 17:49:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8719024181 for ; Tue, 27 Oct 2020 17:49:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603820999; bh=UQvpJwxDgX8zjBH3jLpsVQs9a5dm3mMDDLeWpQrKnFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xrBiqR/2Li5WB8MQI7P+PAwgBD6UugK0EzgRfa41mszC9rG9RC1dtv/xcB8NRwPKP 2FdaSIHpQNfI4slZwwjuzAyIA88MLq2u/aSp4AZE5jpF6+Xo/Wgvob/CoLqoe25MJU axHLVHU0UvoaMb/biOiiZR4xWPehzWgoMpxWGK5A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1822513AbgJ0Rt6 (ORCPT ); Tue, 27 Oct 2020 13:49:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:51464 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2895611AbgJ0OZx (ORCPT ); Tue, 27 Oct 2020 10:25:53 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 53B7220780; Tue, 27 Oct 2020 14:25:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808752; bh=UQvpJwxDgX8zjBH3jLpsVQs9a5dm3mMDDLeWpQrKnFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tJyl4QbmPs3UGcK34xXOKzA+w2lPjaxwiLv6u0Khf6J42l7GmctxMeVZpJsnDv99B I0ywkabVbO1kgEVsHO/Dz6U53MQs2zV0JwuIioV+2pjX0P4tqLXUySEVvQfVeC7tH+ FjoajOg4MGEVsObQoCE74JlHiHClsMR1D3uLH5HY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiaoyang Xu , Alex Williamson , Sasha Levin Subject: [PATCH 4.19 180/264] vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages Date: Tue, 27 Oct 2020 14:53:58 +0100 Message-Id: <20201027135439.130161987@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135430.632029009@linuxfoundation.org> References: <20201027135430.632029009@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Xiaoyang Xu [ Upstream commit 2e6cfd496f5b57034cf2aec738799571b5a52124 ] pfn is not added to pfn_list when vfio_add_to_pfn_list fails. vfio_unpin_page_external will exit directly without calling vfio_iova_put_vfio_pfn. This will lead to a memory leak. Fixes: a54eb55045ae ("vfio iommu type1: Add support for mediated devices") Signed-off-by: Xiaoyang Xu [aw: simplified logic, add Fixes] Signed-off-by: Alex Williamson Signed-off-by: Sasha Levin --- drivers/vfio/vfio_iommu_type1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 05d8553635ee7..95ce167a8ad92 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -636,7 +636,8 @@ static int vfio_iommu_type1_pin_pages(void *iommu_data, ret = vfio_add_to_pfn_list(dma, iova, phys_pfn[i]); if (ret) { - vfio_unpin_page_external(dma, iova, do_accounting); + if (put_pfn(phys_pfn[i], dma->prot) && do_accounting) + vfio_lock_acct(dma, -1, true); goto pin_unwind; } }