Skip to contentSkip to conversation

net: phy: fix memory leak in device-create error path

PATCH In review Johan Hovold 2 participants 2 messages Aug 6, 2020 – Aug 8, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: phy: fix memory leak in device-create error path

A recent commit introduced a late error path in phy_device_create() which fails to release the device name allocated by dev_set_name().

Fixes 13d0ab6750b2 ("net: phy: check return code when requesting PHY driver module")
Cc Heiner Kallweit <[email protected]>
---
 drivers/net/phy/phy_device.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/phy/phy_device.c +4 -4
index 1b9523595839..57d44648c8dd 100644
@@ -615,7 +615,9 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id,
 	if (c45_ids)
 		dev->c45_ids = *c45_ids;
 	dev->irq = bus->irq[addr];
+
 	dev_set_name(&mdiodev->dev, PHY_ID_FMT, bus->id, addr);
+	device_initialize(&mdiodev->dev);
 
 	dev->state = PHY_DOWN;
 
@@ -649,10 +651,8 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id,
 		ret = phy_request_driver_module(dev, phy_id);
 	}
 
-	if (!ret) {
-		device_initialize(&mdiodev->dev);
-	} else {
-		kfree(dev);
+	if (ret) {
+		put_device(&mdiodev->dev);
 		dev = ERR_PTR(ret);
 	}
 
Signature · 1 line
2.26.2
maintainer
#1 lore raw

From: Johan Hovold <[email protected]>
Date: Thu, 6 Aug 2020 17:37:53 +0200

Quoted 6 lines

A recent commit introduced a late error path in phy_device_create() which fails to release the device name allocated by dev_set_name().

Fixes 13d0ab6750b2 ("net: phy: check return code when requesting PHY driver module")
Cc Heiner Kallweit <[email protected]>

Applied and queued up for -stable, thank you.