Skip to contentSkip to conversation

phy: Fix phy_device_free memory leak

PATCH In review Petr Malat 2 participants 2 messages Feb 28, 2013

Subsystems (3)
lore
Share & tools
lore

Petr Malat

author
#0 lore raw

PATCH v2 1/1 phy: Fix phy_device_free memory leak

From: Petr Malat <[email protected]>

Fix memory leak in phy_device_free() for the case when phy_device* returned by phy_device_create() is not registered in the system.

Bug description:
phy_device_create() sets name of kobject using dev_set_name(), which allocates memory using kvasprintf(), but this memory isn't freed if the underlying device isn't registered properly, because kobject_cleanup() is not called in that case. This can happen (and actually is happening on our machines) if phy_device_register(), called by mdiobus_scan(), fails.

Patch description:
Embedded struct device is initialized in phy_device_create() and it counterpart phy_device_free() just drops one reference to the device, which leads to proper deinitialization including releasing the kobject name memory.

---
Updated according to according to David Miller proposal - put_device is used to release the memory now.

Please put me on CC, I'm not signed into the mailing list.

drivers/net/phy/phy_device.c renamed from drivers/net/phy/phy_device.c.orig +6 -4
@@ -44,13 +44,13 @@ MODULE_LICENSE("GPL");
 
 void phy_device_free(struct phy_device *phydev)
 {
-	kfree(phydev);
+	put_device(&phydev->dev);
 }
 EXPORT_SYMBOL(phy_device_free);
 
 static void phy_device_release(struct device *dev)
 {
-	phy_device_free(to_phy_device(dev));
+	kfree(to_phy_device(dev));
 }
 
 static struct phy_driver genphy_driver;
@@ -201,6 +201,8 @@ struct phy_device *phy_device_create(str
 	   there's no driver _already_ loaded. */
 	request_module(MDIO_MODULE_PREFIX MDIO_ID_FMT, MDIO_ID_ARGS(phy_id));
 
+	device_initialize(&dev->dev);
+
 	return dev;
 }
 EXPORT_SYMBOL(phy_device_create);
@@ -363,9 +365,9 @@ int phy_device_register(struct phy_devic
 	/* Run all of the fixups for this PHY */
 	phy_scan_fixups(phydev);
 
-	err = device_register(&phydev->dev);
+	err = device_add(&phydev->dev);
 	if (err) {
-		pr_err("phy %d failed to register\n", phydev->addr);
+		pr_err("PHY %d failed to add\n", phydev->addr);
 		goto out;
 	}
 
maintainer
#1 lore raw

From: Petr Malat <[email protected]>
Date: Thu, 28 Feb 2013 12:01:52 +0100

Quoted 13 lines

From: Petr Malat <[email protected]>

Fix memory leak in phy_device_free() for the case when phy_device* returned by phy_device_create() is not registered in the system.

Bug description:
phy_device_create() sets name of kobject using dev_set_name(), which allocates memory using kvasprintf(), but this memory isn't freed if the underlying device isn't registered properly, because kobject_cleanup() is not called in that case. This can happen (and actually is happening on our machines) if phy_device_register(), called by mdiobus_scan(), fails.

Quoted 7 lines

Patch description:
Embedded struct device is initialized in phy_device_create() and it counterpart phy_device_free() just drops one reference to the device, which leads to proper deinitialization including releasing the kobject name memory.

This looks great, applied, thanks.