netdev - [PATCH net] phy: fix error case of phy_led_triggers

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 23 Nov 2016 21:39:37 +0000
From:   <Woojung.Huh@...rochip.com>
To:     <zach.brown@...com>, <davem@...emloft.net>,
        <netdev@...r.kernel.org>
CC:     <f.fainelli@...il.com>
Subject: [PATCH net] phy: fix error case of phy_led_triggers_(un)register

From: Woojung Huh <woojung.huh@...rochip.com>

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.

Signed-off-by: Woojung Huh <woojung.huh@...rochip.com>
---
 drivers/net/phy/phy_device.c       | 6 +++---
 drivers/net/phy/phy_led_triggers.c | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 9e8f048..094a959 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -915,10 +915,10 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
 	err = phy_init_hw(phydev);
 	if (err)
 		phy_detach(phydev);
-	else
+	else {
 		phy_resume(phydev);
-
-	phy_led_triggers_register(phydev);
+		phy_led_triggers_register(phydev);
+	}
 
 	return err;
 
diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c
index cda600a..3b0b726 100644
--- a/drivers/net/phy/phy_led_triggers.c
+++ b/drivers/net/phy/phy_led_triggers.c
@@ -128,6 +128,9 @@ void phy_led_triggers_unregister(struct phy_device *phy)
 {
 	int i;
 
+	if (!phy->phy_num_led_triggers)
+		return;
+
 	for (i = 0; i < phy->phy_num_led_triggers; i++)
 		phy_led_trigger_unregister(&phy->phy_led_triggers[i]);
 
-- 
2.7.4