diff options
| author | David S. Miller <davem@davemloft.net> | 2020-07-06 12:22:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-06 12:22:24 -0700 |
| commit | 2294ca7a47d7094706450d641b243fa3a61843a3 (patch) | |
| tree | b173462751b8ddd618c34c8ca6c6f17127fe6d01 | |
| parent | 9dc829a135fb5927f1519de11286e2bbb79f5b66 (diff) | |
| parent | 3ed58f96a70b85ef646d5427258f677f1395b62f (diff) | |
| download | linux-2294ca7a47d7094706450d641b243fa3a61843a3.tar.bz2 | |
Merge branch 'smsc95xx-fix-smsc95xx_bind'
Andre Edich says:
====================
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
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/smsc95xx.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 3cf4dc3433f9..bb4ccbda031a 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -1287,11 +1287,14 @@ 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); if (ret < 0) - return ret; + goto free_pdata; + val >>= 16; pdata->chip_id = val; pdata->mdix_ctrl = get_mdix_status(dev->net); @@ -1317,6 +1320,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) |