From a7dac9f9c1695d7470b2f4e7447513e4a71b7c1b Mon Sep 17 00:00:00 2001 From: Woojung Huh Date: Wed, 23 Nov 2016 23:10:33 +0000 Subject: [PATCH] phy: fix error case of phy_led_triggers_(un)register When phy_init_hw() fails at phy_attach_direct(); - phy_detach() calls phy_led_triggers_unregister() without previous call of phy_led_triggers_register(). - still call phy_led_triggers_register() and cause memory leak. Fixes: 2e0bc452f472 ("net: phy: leds: add support for led triggers on phy link state change") Signed-off-by: Woojung Huh Signed-off-by: David S. Miller --- drivers/net/phy/phy_device.c | 6 +++--- drivers/net/phy/phy_led_triggers.c | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 9e8f048891bd..ba86c191a13e 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -914,15 +914,15 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, */ err = phy_init_hw(phydev); if (err) - phy_detach(phydev); - else - phy_resume(phydev); + goto error; + phy_resume(phydev); phy_led_triggers_register(phydev); return err; error: + phy_detach(phydev); put_device(d); module_put(bus->owner); return err; diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c index cda600a1b766..fa62bdf2f526 100644 --- a/drivers/net/phy/phy_led_triggers.c +++ b/drivers/net/phy/phy_led_triggers.c @@ -130,7 +130,5 @@ void phy_led_triggers_unregister(struct phy_device *phy) for (i = 0; i < phy->phy_num_led_triggers; i++) phy_led_trigger_unregister(&phy->phy_led_triggers[i]); - - devm_kfree(&phy->mdio.dev, phy->phy_led_triggers); } EXPORT_SYMBOL_GPL(phy_led_triggers_unregister); -- GitLab