| Message ID | 1565799793-7446-1-git-send-email-wenwen@cs.uga.edu (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | b9cbf8a64865b50fd0f4a3915fa00ac7365cdf8f |
| Headers | show |
| Series | lan78xx: Fix memory leaks | expand |
From: Wenwen Wang <wenwen@cs.uga.edu> Date: Wed, 14 Aug 2019 11:23:13 -0500 > In lan78xx_probe(), a new urb is allocated through usb_alloc_urb() and > saved to 'dev->urb_intr'. However, in the following execution, if an error > occurs, 'dev->urb_intr' is not deallocated, leading to memory leaks. To fix > this issue, invoke usb_free_urb() to free the allocated urb before > returning from the function. > > Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> Applied.
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 3d92ea6..f033fee 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -3792,7 +3792,7 @@ static int lan78xx_probe(struct usb_interface *intf, ret = register_netdev(netdev); if (ret != 0) { netif_err(dev, probe, netdev, "couldn't register the device\n"); - goto out3; + goto out4; } usb_set_intfdata(intf, dev); @@ -3807,12 +3807,14 @@ static int lan78xx_probe(struct usb_interface *intf, ret = lan78xx_phy_init(dev); if (ret < 0) - goto out4; + goto out5; return 0; -out4: +out5: unregister_netdev(netdev); +out4: + usb_free_urb(dev->urb_intr); out3: lan78xx_unbind(dev, intf); out2:
In lan78xx_probe(), a new urb is allocated through usb_alloc_urb() and saved to 'dev->urb_intr'. However, in the following execution, if an error occurs, 'dev->urb_intr' is not deallocated, leading to memory leaks. To fix this issue, invoke usb_free_urb() to free the allocated urb before returning from the function. Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> --- drivers/net/usb/lan78xx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)