Commit d02cbc46 authored by Johan Hovold's avatar Johan Hovold Committed by David S. Miller
Browse files

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: 13d0ab67 ("net: phy: check return code when requesting PHY driver module")
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c3b63f1

drivers/net/phy/phy_device.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

	}