* [PATCH net v2 0/2] smsc95xx: fix smsc95xx_bind
@ 2020-07-06 8:39 Andre Edich
2020-07-06 8:39 ` [PATCH net v2 1/2] smsc95xx: check return value of smsc95xx_reset Andre Edich
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andre Edich @ 2020-07-06 8:39 UTC (permalink / raw)
To: netdev, UNGLinuxDriver, steve.glendinning
Cc: Parthiban.Veerasooran, Andre Edich
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(-)
--
2.27.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net v2 1/2] smsc95xx: check return value of smsc95xx_reset
2020-07-06 8:39 [PATCH net v2 0/2] smsc95xx: fix smsc95xx_bind Andre Edich
@ 2020-07-06 8:39 ` Andre Edich
2020-07-06 8:39 ` [PATCH net v2 2/2] smsc95xx: avoid memory leak in smsc95xx_bind Andre Edich
2020-07-06 19:22 ` [PATCH net v2 0/2] smsc95xx: fix smsc95xx_bind David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Andre Edich @ 2020-07-06 8:39 UTC (permalink / raw)
To: netdev, UNGLinuxDriver, steve.glendinning
Cc: Parthiban.Veerasooran, Andre Edich
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")
Signed-off-by: Andre Edich <andre.edich@microchip.com>
Signed-off-by: Parthiban Veerasooran <Parthiban.Veerasooran@microchip.com>
---
drivers/net/usb/smsc95xx.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 3cf4dc3433f9..eb404bb74e18 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -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)
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net v2 2/2] smsc95xx: avoid memory leak in smsc95xx_bind
2020-07-06 8:39 [PATCH net v2 0/2] smsc95xx: fix smsc95xx_bind Andre Edich
2020-07-06 8:39 ` [PATCH net v2 1/2] smsc95xx: check return value of smsc95xx_reset Andre Edich
@ 2020-07-06 8:39 ` Andre Edich
2020-07-06 19:22 ` [PATCH net v2 0/2] smsc95xx: fix smsc95xx_bind David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Andre Edich @ 2020-07-06 8:39 UTC (permalink / raw)
To: netdev, UNGLinuxDriver, steve.glendinning
Cc: Parthiban.Veerasooran, 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")
Signed-off-by: Andre Edich <andre.edich@microchip.com>
Signed-off-by: Parthiban Veerasooran <Parthiban.Veerasooran@microchip.com>
---
drivers/net/usb/smsc95xx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index eb404bb74e18..bb4ccbda031a 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -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);
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net v2 0/2] smsc95xx: fix smsc95xx_bind
2020-07-06 8:39 [PATCH net v2 0/2] smsc95xx: fix smsc95xx_bind Andre Edich
2020-07-06 8:39 ` [PATCH net v2 1/2] smsc95xx: check return value of smsc95xx_reset Andre Edich
2020-07-06 8:39 ` [PATCH net v2 2/2] smsc95xx: avoid memory leak in smsc95xx_bind Andre Edich
@ 2020-07-06 19:22 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2020-07-06 19:22 UTC (permalink / raw)
To: andre.edich
Cc: netdev, UNGLinuxDriver, steve.glendinning, Parthiban.Veerasooran
From: Andre Edich <andre.edich@microchip.com>
Date: Mon, 6 Jul 2020 10:39:33 +0200
> 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-06 19:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-06 8:39 [PATCH net v2 0/2] smsc95xx: fix smsc95xx_bind Andre Edich
2020-07-06 8:39 ` [PATCH net v2 1/2] smsc95xx: check return value of smsc95xx_reset Andre Edich
2020-07-06 8:39 ` [PATCH net v2 2/2] smsc95xx: avoid memory leak in smsc95xx_bind Andre Edich
2020-07-06 19:22 ` [PATCH net v2 0/2] smsc95xx: fix smsc95xx_bind David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.