Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1292007

[PATCH 8/9] phy: cygnus: pcie: add missing of_node_put

Show all headers | View raw

From: Julia Lawall <Julia.Lawall@lip6.fr>

for_each_available_child_of_node performs an of_node_get on each iteration,
so a return from the middle of the loop requires an of_node_put.

A simplified version of the semantic patch that finds this problem is as
follows (http://coccinelle.lip6.fr):

// <smpl>
@@
expression root,e;
local idexpression child;
@@

 for_each_available_child_of_node(root, child) {
   ... when != of_node_put(child)
       when != e = child
(
   return child;
|
*  return ...;
)
   ...
 }
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/phy/phy-bcm-cygnus-pcie.c |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/phy/phy-bcm-cygnus-pcie.c b/drivers/phy/phy-bcm-cygnus-pcie.c
index 7ad72b7..082c03f 100644
--- a/drivers/phy/phy-bcm-cygnus-pcie.c
+++ b/drivers/phy/phy-bcm-cygnus-pcie.c
@@ -128,6 +128,7 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
 	struct phy_provider *provider;
 	struct resource *res;
 	unsigned cnt = 0;
+	int ret;
 
 	if (of_get_child_count(node) == 0) {
 		dev_err(dev, "PHY no child node\n");
@@ -154,24 +155,28 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
 		if (of_property_read_u32(child, "reg", &id)) {
 			dev_err(dev, "missing reg property for %s\n",
 				child->name);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto put_child;
 		}
 
 		if (id >= MAX_NUM_PHYS) {
 			dev_err(dev, "invalid PHY id: %u\n", id);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto put_child;
 		}
 
 		if (core->phys[id].phy) {
 			dev_err(dev, "duplicated PHY id: %u\n", id);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto put_child;
 		}
 
 		p = &core->phys[id];
 		p->phy = devm_phy_create(dev, child, &cygnus_pcie_phy_ops);
 		if (IS_ERR(p->phy)) {
 			dev_err(dev, "failed to create PHY\n");
-			return PTR_ERR(p->phy);
+			ret = PTR_ERR(p->phy);
+			goto put_child;
 		}
 
 		p->core = core;
@@ -191,6 +196,9 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
 	dev_dbg(dev, "registered %u PCIe PHY(s)\n", cnt);
 
 	return 0;
+put_child:
+	of_node_put(child);
+	return ret;
 }
 
 static const struct of_device_id cygnus_pcie_phy_match_table[] = {
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[RESEND GIT PULL 0/9] phy: for 4.4 -rc Kishon Vijay Abraham I <kishon@ti.com> - 2015-12-15 11:10 +0100
  [PATCH 9/9] phy: core: Get a refcount to phy in devm_of_phy_get_by_index() Kishon Vijay Abraham I <kishon@ti.com> - 2015-12-15 11:10 +0100
  [PATCH 7/9] phy: miphy365x: add missing of_node_put Kishon Vijay Abraham I <kishon@ti.com> - 2015-12-15 11:10 +0100
  [PATCH 8/9] phy: cygnus: pcie: add missing of_node_put Kishon Vijay Abraham I <kishon@ti.com> - 2015-12-15 11:10 +0100
  [PATCH 2/9] phy: brcmstb-sata: add missing of_node_put Kishon Vijay Abraham I <kishon@ti.com> - 2015-12-15 11:10 +0100
  [PATCH 5/9] phy: rockchip-usb: add missing of_node_put Kishon Vijay Abraham I <kishon@ti.com> - 2015-12-15 11:20 +0100
  [PATCH 4/9] phy: berlin-sata: add missing of_node_put Kishon Vijay Abraham I <kishon@ti.com> - 2015-12-15 11:20 +0100
  [PATCH 3/9] phy: mt65xx-usb3: add missing of_node_put Kishon Vijay Abraham I <kishon@ti.com> - 2015-12-15 11:20 +0100
  Re: [RESEND GIT PULL 0/9] phy: for 4.4 -rc Greg KH <gregkh@linuxfoundation.org> - 2015-12-18 18:30 +0100
    Re: [RESEND GIT PULL 0/9] phy: for 4.4 -rc Kishon Vijay Abraham I <kishon@ti.com> - 2015-12-20 09:30 +0100

csiph-web