From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751102AbdAMAJG (ORCPT ); Thu, 12 Jan 2017 19:09:06 -0500 Received: from 108-197-250-228.lightspeed.miamfl.sbcglobal.net ([108.197.250.228]:45086 "EHLO a-desktop" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750781AbdAMAJF (ORCPT ); Thu, 12 Jan 2017 19:09:05 -0500 X-Greylist: delayed 617 seconds by postgrey-1.27 at vger.kernel.org; Thu, 12 Jan 2017 19:09:04 EST From: Abylay Ospan To: Bjorn Helgaas , Ray Jui , Scott Branden , Jon Mason , bcm-kernel-feedback-list@broadcom.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Abylay Ospan Subject: [PATCH] PCI: iproc: fix resource allocation for BCMA PCIe Date: Fri, 13 Jan 2017 02:58:41 +0300 Message-Id: <1484265521-13497-1-git-send-email-aospan@netup.ru> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Resource allocated on stack was saved by 'devm_request_resource' to global 'iomem_resource' but become invalid after 'iproc_pcie_bcma_probe' exit. So the global 'iomem_resource' was poisoned. This may cause kernel crash or second PCIe bridge registration failure. Tested on Broadcom NorthStar machine ('Edgecore ECW7220-L') with two PCIe wifi adapters (b43 BCM4331 and ath10k QCA988X). Signed-off-by: Abylay Ospan --- drivers/pci/host/pcie-iproc-bcma.c | 18 ++++++++---------- drivers/pci/host/pcie-iproc.h | 2 ++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/pci/host/pcie-iproc-bcma.c b/drivers/pci/host/pcie-iproc-bcma.c index bd4c9ec..28f9b89 100644 --- a/drivers/pci/host/pcie-iproc-bcma.c +++ b/drivers/pci/host/pcie-iproc-bcma.c @@ -44,8 +44,6 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) { struct device *dev = &bdev->dev; struct iproc_pcie *pcie; - LIST_HEAD(res); - struct resource res_mem; int ret; pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); @@ -62,21 +60,21 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) } pcie->base_addr = bdev->addr; + INIT_LIST_HEAD(&pcie->resources); - res_mem.start = bdev->addr_s[0]; - res_mem.end = bdev->addr_s[0] + SZ_128M - 1; - res_mem.name = "PCIe MEM space"; - res_mem.flags = IORESOURCE_MEM; - pci_add_resource(&res, &res_mem); + pcie->res_mem.start = bdev->addr_s[0]; + pcie->res_mem.end = bdev->addr_s[0] + SZ_128M - 1; + pcie->res_mem.name = "PCIe MEM space"; + pcie->res_mem.flags = IORESOURCE_MEM; + pcie->res_mem.child = NULL; + pci_add_resource(&pcie->resources, &pcie->res_mem); pcie->map_irq = iproc_pcie_bcma_map_irq; - ret = iproc_pcie_setup(pcie, &res); + ret = iproc_pcie_setup(pcie, &pcie->resources); if (ret) dev_err(dev, "PCIe controller setup failed\n"); - pci_free_resource_list(&res); - bcma_set_drvdata(bdev, pcie); return ret; } diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h index 04fed8e..866d649 100644 --- a/drivers/pci/host/pcie-iproc.h +++ b/drivers/pci/host/pcie-iproc.h @@ -105,6 +105,8 @@ struct iproc_pcie { bool need_msi_steer; struct iproc_msi *msi; + struct resource res_mem; + struct list_head resources; }; int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res); -- 2.7.4