Commit 0c31f1d7 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Bjorn Helgaas

PCI: rcar: Fix use-after-free in probe error path

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: ddd535f1 ("PCI: rcar: Fix memory leak when no PCIe card is inserted")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent a19e2696
...@@ -1128,12 +1128,12 @@ static int rcar_pcie_probe(struct platform_device *pdev) ...@@ -1128,12 +1128,12 @@ static int rcar_pcie_probe(struct platform_device *pdev)
err = rcar_pcie_get_resources(pcie); err = rcar_pcie_get_resources(pcie);
if (err < 0) { if (err < 0) {
dev_err(dev, "failed to request resources: %d\n", err); 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); err = rcar_pcie_parse_map_dma_ranges(pcie, dev->of_node);
if (err) if (err)
goto err_free_bridge; goto err_free_resource_list;
pm_runtime_enable(dev); pm_runtime_enable(dev);
err = pm_runtime_get_sync(dev); err = pm_runtime_get_sync(dev);
...@@ -1176,9 +1176,9 @@ static int rcar_pcie_probe(struct platform_device *pdev) ...@@ -1176,9 +1176,9 @@ static int rcar_pcie_probe(struct platform_device *pdev)
err_pm_disable: err_pm_disable:
pm_runtime_disable(dev); pm_runtime_disable(dev);
err_free_bridge: err_free_resource_list:
pci_free_host_bridge(bridge);
pci_free_resource_list(&pcie->resources); pci_free_resource_list(&pcie->resources);
pci_free_host_bridge(bridge);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment