From patchwork Tue Oct 27 13:54:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 307260 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 6B300C388F9 for ; Tue, 27 Oct 2020 16:54:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1781620728 for ; Tue, 27 Oct 2020 16:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603817664; bh=ujQ6vsxZv7Yrxs8alK/iqSq46uuwkkVKfdjy/gvsfzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OUmfAcsTm8XsGnYyiufc2jV/FAAf5ULbuiRmyknvodsPs8o5h0tTAfLKMdEWpTiB8 cd1qRIrdzOXBsW5bjK+avlejLwxSl6RuvbLAVMIxiRv7qJZqXf1o2RFjBxxoVCXqA9 k1ci67Iw1timH/GzIdH3Ue6BUyPlMfmc2e/9Kli8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1813748AbgJ0QyV (ORCPT ); Tue, 27 Oct 2020 12:54:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:47984 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1794470AbgJ0PL7 (ORCPT ); Tue, 27 Oct 2020 11:11:59 -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 1317B20657; Tue, 27 Oct 2020 15:11:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811517; bh=ujQ6vsxZv7Yrxs8alK/iqSq46uuwkkVKfdjy/gvsfzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OGoQzDZY9r9DIIFFk4zvbGiKN+0ANx5un4nw5XiJmk1GN1GHJm72S5eMqX6KfgghE 4TN0CtZVt18HcKAexL2iRVamGbCxs5gM2wV4/LeWgMzppwkHgBWKQBLlzHcMgRf/73 5X42xo8Oi4W5iWNSqzcLgHh7LRsEJPPE7sWIkgQA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kaige Li , Jon Mason , Sasha Levin Subject: [PATCH 5.8 522/633] NTB: hw: amd: fix an issue about leak system resources Date: Tue, 27 Oct 2020 14:54:25 +0100 Message-Id: <20201027135547.254055621@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kaige Li [ Upstream commit 44a0a3c17919db1498cebb02ecf3cf4abc1ade7b ] The related system resources were not released when pci_set_dma_mask(), pci_set_consistent_dma_mask(), or pci_iomap() return error in the amd_ntb_init_pci() function. Add pci_release_regions() to fix it. Fixes: a1b3695820aa ("NTB: Add support for AMD PCI-Express Non-Transparent Bridge") Signed-off-by: Kaige Li Signed-off-by: Jon Mason Signed-off-by: Sasha Levin --- drivers/ntb/hw/amd/ntb_hw_amd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c index 88e1db65be02c..71428d8cbcfc5 100644 --- a/drivers/ntb/hw/amd/ntb_hw_amd.c +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c @@ -1203,6 +1203,7 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev, err_dma_mask: pci_clear_master(pdev); + pci_release_regions(pdev); err_pci_regions: pci_disable_device(pdev); err_pci_enable: