Skip to contentSkip to conversation

smsc95xx: fix smsc95xx_bind

PATCH In review Andre Edich 2 participants 4 messages Jul 6, 2020

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

v2 cover smsc95xx: fix smsc95xx_bind

The patchset fixes two problems in the function smsc95xx_bind:
- return of false success
- memory leak

Changes in v2:
- added "Fixes" tags to both patches

Andre Edich (2):
smsc95xx: check return value of smsc95xx_reset
smsc95xx: avoid memory leak in smsc95xx_bind

 drivers/net/usb/smsc95xx.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
Signature · 1 line
2.27.0
#1 lore raw

PATCH v2 1/2 smsc95xx: check return value of smsc95xx_reset

The return value of the function smsc95xx_reset() must be checked to avoid returning false success from the function smsc95xx_bind().

Fixes 2f7ca802bdae2 ("net: Add SMSC LAN9500 USB2.0 10/100 ethernet adapter driver")
---
 drivers/net/usb/smsc95xx.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/net/usb/smsc95xx.c +6 -0
index 3cf4dc3433f9..eb404bb74e18 100644
@@ -1287,6 +1287,8 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
 
 	/* Init all registers */
 	ret = smsc95xx_reset(dev);
+	if (ret)
+		goto free_pdata;
 
 	/* detect device revision as different features may be available */
 	ret = smsc95xx_read_reg(dev, ID_REV, &val);
@@ -1317,6 +1319,10 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
 	schedule_delayed_work(&pdata->carrier_check, CARRIER_CHECK_DELAY);
 
 	return 0;
+
+free_pdata:
+	kfree(pdata);
+	return ret;
 }
 
 static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf)
Signature · 1 line
2.27.0
#2 lore raw

PATCH v2 2/2 smsc95xx: avoid memory leak in smsc95xx_bind

In reply to Andre Edich

In a case where the ID_REV register read is failed, the memory for a private data structure has to be freed before returning error from the function smsc95xx_bind.

Fixes bbd9f9ee69242 ("smsc95xx: add wol support for more frame types")
---
 drivers/net/usb/smsc95xx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/usb/smsc95xx.c +2 -1
index eb404bb74e18..bb4ccbda031a 100644
@@ -1293,7 +1293,8 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
 	/* detect device revision as different features may be available */
 	ret = smsc95xx_read_reg(dev, ID_REV, &val);
 	if (ret < 0)
-		return ret;
+		goto free_pdata;
+
 	val >>= 16;
 	pdata->chip_id = val;
 	pdata->mdix_ctrl = get_mdix_status(dev->net);
Signature · 1 line
2.27.0
maintainer
#3 lore raw
In reply to Andre Edich

From: Andre Edich <[email protected]>
Date: Mon, 6 Jul 2020 10:39:33 +0200

Quoted 6 lines

The patchset fixes two problems in the function smsc95xx_bind:
- return of false success
- memory leak

Changes in v2:
- added "Fixes" tags to both patches

Series applied, thank you.