Patch "[media] usbvision: fix leak of usb_dev on failure paths in usbvision_probe()" has been added to the 3.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
[media] usbvision: fix leak of usb_dev on failure paths in usbvision_probe()
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usbvision-fix-leak-of-usb_dev-on-failure-paths-in-usbvision_probe.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
afd270d1a45043cef14341bcceff62ed50e8dc9aMon Sep 17 00:00:00 2001
From: Alexey Khoroshilov <[email protected]>
Date: Fri, 27 Mar 2015 19:39:09 -0300
Subject: [media] usbvision: fix leak of usb_dev on failure paths in usbvision_probe()
From: Alexey Khoroshilov <[email protected]>
commit afd270d1a45043cef14341bcceff62ed50e8dc9a upstream.
There is no usb_put_dev() on failure paths in usbvision_probe().
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/usb/usbvision/usbvision-video.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
drivers/media/usb/usbvision/usbvision-video.c +17 -7
@@ -1522,7 +1522,7 @@ static int usbvision_probe(struct usb_inconst struct usb_host_interface *interface;struct usb_usbvision *usbvision =NULL ;const struct usb_endpoint_descriptor *endpoint; -int model, i; +int model, i, ret; PDEBUG(DBG_PROBE, "VID=%#04x, PID=%#04x, ifnum=%u", dev->descriptor.idVendor,
@@ -1531,7 +1531,8 @@ static int usbvision_probe(struct usb_in model = devid->driver_info;if (model <0 || model >= usbvision_device_data_size) {PDEBUG (DBG_PROBE ,"model out of bounds %d" , model); -return -ENODEV ; + ret = -ENODEV ; + goto err_usb; }printk (KERN_INFO "%s: %s found\n" , __func__, usbvision_device_data[model].model_string);
@@ -1553,18 +1554,21 @@ static int usbvision_probe(struct usb_in __func__, ifnum);dev_err (&intf->dev,"%s: Endpoint attributes %d" , __func__, endpoint->bmAttributes); -return -ENODEV ; + ret = -ENODEV ; + goto err_usb; }if (usb_endpoint_dir_out (endpoint)) {dev_err (&intf->dev,"%s: interface %d. has ISO OUT endpoint!\n" , __func__, ifnum); -return -ENODEV ; + ret = -ENODEV ; + goto err_usb; } usbvision =usbvision_alloc (dev, intf);if (usbvision ==NULL ) {dev_err (&intf->dev,"%s: couldn't allocate USBVision struct\n" , __func__); -return -ENOMEM ; + ret = -ENOMEM ; + goto err_usb; }if (dev->descriptor.bNumConfigurations >1 )
@@ -1583,8 +1587,8 @@ static int usbvision_probe(struct usb_in usbvision->alt_max_pkt_size =kmalloc (32 * usbvision->num_alt,GFP_KERNEL );if (usbvision->alt_max_pkt_size ==NULL ) {dev_err (&intf->dev,"usbvision: out of memory!\n" ); -usbvision_release (usbvision); -return -ENOMEM ; + ret = -ENOMEM ; + goto err_pkt; }for (i =0 ; i < usbvision->num_alt; i++) {
@@ -1619,6 +1623,12 @@ static int usbvision_probe(struct usb_inPDEBUG (DBG_PROBE ,"success" );return 0 ; + +err_pkt: +usbvision_release (usbvision); +err_usb: +usb_put_dev (dev); +return ret; }
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/usbvision-fix-leak-of-usb_dev-on-failure-paths-in-usbvision_probe.patch