From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752415AbdLLT3u (ORCPT ); Tue, 12 Dec 2017 14:29:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:38290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751871AbdLLT3q (ORCPT ); Tue, 12 Dec 2017 14:29:46 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE21D20671 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=helgaas@kernel.org Date: Tue, 12 Dec 2017 13:29:42 -0600 From: Bjorn Helgaas To: Geert Uytterhoeven Cc: Simon Horman , Lorenzo Pieralisi , Bjorn Helgaas , Harunobu Kurokawa , Phil Edworthy , linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] PCI: rcar: Fix use-after-free in probe error path Message-ID: <20171212192942.GE53955@bhelgaas-glaptop.roam.corp.google.com> References: <1512641720-4715-1-git-send-email-geert+renesas@glider.be> <1512641720-4715-2-git-send-email-geert+renesas@glider.be> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1512641720-4715-2-git-send-email-geert+renesas@glider.be> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 07, 2017 at 11:15:19AM +0100, Geert Uytterhoeven wrote: > If CONFIG_DEBUG_SLAB=y, and no PCIe card is inserted, the kernel crashes > during probe on r8a7791/koelsch: > > rcar-pcie fe000000.pcie: PCIe link down > Unable to handle kernel paging request at virtual address 6b6b6b6b > > (seeing this message requires earlycon and keep_bootcon). > > Indeed, pci_free_host_bridge() frees the PCI host bridge, including the > embedded rcar_pcie object, so pci_free_resource_list() must not be > called afterwards. > > To fix this, move the call to pci_free_resource_list() up, and update the > label name accordingly. > > Fixes: ddd535f1ea3eb27e ("PCI: rcar: Fix memory leak when no PCIe card is inserted") > Signed-off-by: Geert Uytterhoeven Applied with Simon's and Lorenzo's acks to for-linus for v4.15, thanks! I'll leave the second patch up to Lorenzo for v4.16, since it doesn't seem as critical. > --- > drivers/pci/host/pcie-rcar.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index 12796eccb2befd91..52ab3cb0a0bfe065 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -1128,12 +1128,12 @@ static int rcar_pcie_probe(struct platform_device *pdev) > err = rcar_pcie_get_resources(pcie); > if (err < 0) { > dev_err(dev, "failed to request resources: %d\n", err); > - goto err_free_bridge; > + goto err_free_resource_list; > } > > err = rcar_pcie_parse_map_dma_ranges(pcie, dev->of_node); > if (err) > - goto err_free_bridge; > + goto err_free_resource_list; > > pm_runtime_enable(dev); > err = pm_runtime_get_sync(dev); > @@ -1176,9 +1176,9 @@ static int rcar_pcie_probe(struct platform_device *pdev) > err_pm_disable: > pm_runtime_disable(dev); > > -err_free_bridge: > - pci_free_host_bridge(bridge); > +err_free_resource_list: > pci_free_resource_list(&pcie->resources); > + pci_free_host_bridge(bridge); > > return err; > } > -- > 2.7.4 >