leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: rtl8192u: fix multiple memory leaks on error path

Browse Source 
In rtl8192_tx on error handling path allocated urbs and also skb should
be released.

Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Link: https://lore.kernel.org/r/20190920025137.29407-1-navid.emamdoost@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Navid Emamdoost 2019-09-19 21:51:33 -05:00 committed by Greg Kroah-Hartman
parent 0911224b6b
commit ca312438cf
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/rtl8192u/r8192U_core.c
View File

@ -1402,7 +1402,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
(struct tx_fwinfo_819x_usb *)(skb->data + USB_HWDESC_HEADER_LEN); (struct tx_fwinfo_819x_usb *)(skb->data + USB_HWDESC_HEADER_LEN);
struct usb_device *udev = priv->udev; struct usb_device *udev = priv->udev;
int pend; int pend;
int status; int status, rt = -1;
struct urb *tx_urb = NULL, *tx_urb_zero = NULL; struct urb *tx_urb = NULL, *tx_urb_zero = NULL;
unsigned int idx_pipe; unsigned int idx_pipe;
@ -1546,8 +1546,10 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
} }
if (bSend0Byte) { if (bSend0Byte) {
tx_urb_zero = usb_alloc_urb(0, GFP_ATOMIC); tx_urb_zero = usb_alloc_urb(0, GFP_ATOMIC);
if (!tx_urb_zero) if (!tx_urb_zero) {
return -ENOMEM; rt = -ENOMEM;
goto error;
}
usb_fill_bulk_urb(tx_urb_zero, udev, usb_fill_bulk_urb(tx_urb_zero, udev,
usb_sndbulkpipe(udev, idx_pipe), usb_sndbulkpipe(udev, idx_pipe),
&zero, 0, tx_zero_isr, dev); &zero, 0, tx_zero_isr, dev);
@ -1557,7 +1559,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
"Error TX URB for zero byte %d, error %d", "Error TX URB for zero byte %d, error %d",
atomic_read(&priv->tx_pending[tcb_desc->queue_index]), atomic_read(&priv->tx_pending[tcb_desc->queue_index]),
status); status);
return -1; goto error;
} }
} }
netif_trans_update(dev); netif_trans_update(dev);
@ -1568,7 +1570,12 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
RT_TRACE(COMP_ERR, "Error TX URB %d, error %d", RT_TRACE(COMP_ERR, "Error TX URB %d, error %d",
atomic_read(&priv->tx_pending[tcb_desc->queue_index]), atomic_read(&priv->tx_pending[tcb_desc->queue_index]),
status); status);
return -1;
error:
dev_kfree_skb_any(skb);
usb_free_urb(tx_urb);
usb_free_urb(tx_urb_zero);
return rt;
} }
static short rtl8192_usb_initendpoints(struct net_device *dev) static short rtl8192_usb_initendpoints(struct net_device *dev)