Skip to contentSkip to conversation

net: phy: fix of_node and device leaks

PATCH In review Johan Hovold 2 participants 5 messages Nov 16, 2016 – Nov 17, 2016

Subsystems (4)
Networking Network drivers Ethernet PHY Device tree
lore
Share & tools
lore

Johan Hovold

author
#0 lore raw

cover net: phy: fix of_node and device leaks

These patches fix a couple of of_node leaks in the fixed-link code and a device reference leak in a phy helper.

Johan

Johan Hovold (3):
of_mdio: fix node leak in of_phy_register_fixed_link error path
of_mdio: fix device reference leak in of_phy_find_device
net: phy: fixed_phy: fix of_node leak in fixed_phy_unregister

 drivers/net/phy/fixed_phy.c | 2 +-
 drivers/of/of_mdio.c        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
Signature · 1 line
2.7.3
author
#1 lore raw

PATCH 1/3 of_mdio: fix node leak in of_phy_register_fixed_link error path

Make sure to drop the of_node reference also on failure to parse the speed property in of_phy_register_fixed_link().

Fixes 3be2a49e5c08 ("of: provide a binding for fixed link PHYs")
Signed-off-by Johan Hovold <[email protected]>
---
 drivers/of/of_mdio.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/of/of_mdio.c +4 -1
index b470f7e3521d..8f4648383fb2 100644
@@ -456,8 +456,11 @@ int of_phy_register_fixed_link(struct device_node *np)
 		status.link = 1;
 		status.duplex = of_property_read_bool(fixed_link_node,
 						      "full-duplex");
-		if (of_property_read_u32(fixed_link_node, "speed", &status.speed))
+		if (of_property_read_u32(fixed_link_node, "speed",
+					 &status.speed)) {
+			of_node_put(fixed_link_node);
 			return -EINVAL;
+		}
 		status.pause = of_property_read_bool(fixed_link_node, "pause");
 		status.asym_pause = of_property_read_bool(fixed_link_node,
 							  "asym-pause");
Signature · 1 line
2.7.3
author
#2 lore raw

PATCH 2/3 of_mdio: fix device reference leak in of_phy_find_device

In reply to Johan Hovold

Make sure to drop the reference taken by bus_find_device() before returning NULL from of_phy_find_device() when the found device is not a PHY.

Fixes 6ed742363b9c ("of: of_mdio: Ensure mdio device is a PHY")
Signed-off-by Johan Hovold <[email protected]>
---
 drivers/of/of_mdio.c | 1 +
 1 file changed, 1 insertion(+)
drivers/of/of_mdio.c +1 -0
index 8f4648383fb2..5a3145a02547 100644
@@ -292,6 +292,7 @@ struct phy_device *of_phy_find_device(struct device_node *phy_np)
 		mdiodev = to_mdio_device(d);
 		if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY)
 			return to_phy_device(d);
+		put_device(d);
 	}
 
 	return NULL;
Signature · 1 line
2.7.3
author
#3 lore raw

PATCH 3/3 net: phy: fixed_phy: fix of_node leak in fixed_phy_unregister

In reply to Johan Hovold

Make sure to drop the of_node reference taken in fixed_phy_register() when deregistering a PHY.

Fixes a75951217472 ("net: phy: extend fixed driver with

fixed_phy_register()")

Signed-off-by Johan Hovold <[email protected]>
---
 drivers/net/phy/fixed_phy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/fixed_phy.c +1 -1
index c649c101bbab..eb5167210681 100644
@@ -279,7 +279,7 @@ EXPORT_SYMBOL_GPL(fixed_phy_register);
 void fixed_phy_unregister(struct phy_device *phy)
 {
 	phy_device_remove(phy);
-
+	of_node_put(phy->mdio.dev.of_node);
 	fixed_phy_del(phy->mdio.addr);
 }
 EXPORT_SYMBOL_GPL(fixed_phy_unregister);
Signature · 1 line
2.7.3