pci: controller: brcmstb: Move of_node_put() out of 'if' in brcm_pcie_probe
Subsystems (5)
PATCH 1/1 pci: controller: brcmstb: Move of_node_put() out of 'if' in brcm_pcie_probe
Commit 3a87cb8f6a ("Fix refcount leak in brcm_pcie_probe()") adds of_node_put() for of_parse_phandle() in fail path but not adds it correctly in normal path. We should move the second of_node_put() out of the 'if(pci_msi_enabled() && msi_np == pcie->np)'.
---
Patched file has been compiled test in next branch.
drivers/pci/controller/pcie-brcmstb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pcie-brcmstb.c +1 -1
@@ -1413,8 +1413,8 @@ static int brcm_pcie_probe(struct platform_device *pdev)of_node_put (msi_np); goto fail; } -of_node_put (msi_np); } +of_node_put (msi_np); bridge->ops = pcie->type ==BCM7425 ? &brcm_pcie_ops32 : &brcm_pcie_ops; bridge->sysdata = pcie;
Signature · 1 line
2.25.1
Quoted 19 lines · Liang He
Commit
3a87cb8f6a("Fix refcount leak inbrcm_pcie_probe()") addsof_node_put()forof_parse_phandle()in fail path but not adds it correctly in normal path. We should move the secondof_node_put()out of the 'if(pci_msi_enabled() && msi_np == pcie->np)'.Fixes 3a87cb8f6a ("Fix refcount leak in brcm_pcie_probe()")Co-authored-by Miaoqian Lin <[email protected]>Signed-off-by Liang He <[email protected]>---
Patched file has been compiled test in next branch.drivers/pci/controller/pcie-brcmstb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pci/controller/pcie-brcmstb.c +0
-0
drivers/pci/controller/pcie-brcmstb.c static int brcm_pcie_probe(struct platform_device *pdev) · line 1417
Quoted 6 lines
drivers/pci/controller/pcie-brcmstb.c +1
-1@@ -1413,8 +1413,8 @@ static int brcm_pcie_probe(struct platform_device *pdev)of_node_put (msi_np); goto fail; } -of_node_put (msi_np); } +of_node_put (msi_np);
Can we just move the of_parse_phandle() and related checking into brcm_pcie_enable_msi()? It can return success without doing anything if !pci_msi_enabled() or msi_np != pcie_np.
If you don't want to do that, please just send a revised version of 3a87cb8f6a72 ("PCI: brcmstb: Fix refcount leak in brcm_pcie_probe()"). That's not upstream yet, and I don't want to clutter the git history with a fix of a fix.
Quoted 5 lines
drivers/pci/controller/pcie-brcmstb.c +0
-0bridge->ops = pcie->type ==BCM7425 ? &brcm_pcie_ops32 : &brcm_pcie_ops; bridge->sysdata = pcie;Signature · 1 line
2.25.1
Quoted 31 lines · Bjorn Helgaas
Quoted 19 lines · Liang He
Commit
3a87cb8f6a("Fix refcount leak inbrcm_pcie_probe()") addsof_node_put()forof_parse_phandle()in fail path but not adds it correctly in normal path. We should move the secondof_node_put()out of the 'if(pci_msi_enabled() && msi_np == pcie->np)'.Fixes 3a87cb8f6a ("Fix refcount leak in brcm_pcie_probe()")Co-authored-by Miaoqian Lin <[email protected]>Signed-off-by Liang He <[email protected]>---
Patched file has been compiled test in next branch.drivers/pci/controller/pcie-brcmstb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pci/controller/pcie-brcmstb.c +0
-0drivers/pci/controller/pcie-brcmstb.c static int brcm_pcie_probe(struct platform_device *pdev) · line 1417
Quoted 6 lines
drivers/pci/controller/pcie-brcmstb.c +1
-1@@ -1413,8 +1413,8 @@ static int brcm_pcie_probe(struct platform_device *pdev)of_node_put (msi_np); goto fail; } -of_node_put (msi_np); } +of_node_put (msi_np);Can we just move the
of_parse_phandle()and related checking intobrcm_pcie_enable_msi()? It can return success without doing anything if !pci_msi_enabled() ormsi_np!=pcie_np.
Quoted 6 lines
If you don't want to do that, please just send a revised version of
3a87cb8f6a72("PCI: brcmstb: Fix refcount leak inbrcm_pcie_probe()"). That's not upstream yet, and I don't want to clutter the git history with a fix of a fix.
Thanks, Bjorn,
We will make a better version or a revised version soon. Liang
Quoted 5 lines
Quoted 5 lines
drivers/pci/controller/pcie-brcmstb.c +0
-0bridge->ops = pcie->type ==BCM7425 ? &brcm_pcie_ops32 : &brcm_pcie_ops; bridge->sysdata = pcie;Signature · 1 line
2.25.1