evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: ft1000: fix memory leak on error path in ft1000_probe()

Browse source 
ft1000dev->tx_urb and ft1000dev->rx_urb are not deallocated
if something goes wrong in ft1000_probe(). Also there is no
check for success of urb allocation. The patch fixes the both issues.

By the way, there is no sense in GFP_ATOMIC for urb allocation here,
so it is changed to GFP_KERNEL.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexey Khoroshilov 2013-06-10 23:29:16 +04:00 • committed by Greg Kroah-Hartman
parent 5f43264c53
commit 773fe724ab
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
View file

@ -79,8 +79,12 @@ static int ft1000_probe(struct usb_interface *interface,
ft1000dev->dev = dev; ft1000dev->dev = dev;
ft1000dev->status = 0; ft1000dev->status = 0;
ft1000dev->net = NULL; ft1000dev->net = NULL;
ft1000dev->tx_urb = usb_alloc_urb(0, GFP_ATOMIC); ft1000dev->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
ft1000dev->rx_urb = usb_alloc_urb(0, GFP_ATOMIC); ft1000dev->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!ft1000dev->tx_urb || !ft1000dev->rx_urb) {
ret = -ENOMEM;
goto err_fw;
}
DEBUG("ft1000_probe is called\n"); DEBUG("ft1000_probe is called\n");
numaltsetting = interface->num_altsetting; numaltsetting = interface->num_altsetting;
@ -209,6 +213,8 @@ err_thread:
err_load: err_load:
kfree(pFileStart); kfree(pFileStart);
err_fw: err_fw:
usb_free_urb(ft1000dev->rx_urb);
usb_free_urb(ft1000dev->tx_urb);
kfree(ft1000dev); kfree(ft1000dev);
return ret; return ret;
} }