lkml.org 
[lkml]   [2016]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 85/87] [media] usbvision: fix leak of usb_dev on failure paths in usbvision_probe()
    3.2.77-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alexey Khoroshilov <khoroshilov@ispras.ru>

    commit afd270d1a45043cef14341bcceff62ed50e8dc9a upstream.

    There is no usb_put_dev() on failure paths in usbvision_probe().

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

    Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
    [bwh: Backported to 3.2: adjust filename]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/media/video/usbvision/usbvision-video.c | 24 +++++++++++++++++-------
    1 file changed, 17 insertions(+), 7 deletions(-)

    --- a/drivers/media/video/usbvision/usbvision-video.c
    +++ b/drivers/media/video/usbvision/usbvision-video.c
    @@ -1487,7 +1487,7 @@ static int __devinit usbvision_probe(str
    const 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,
    @@ -1496,7 +1496,8 @@ static int __devinit usbvision_probe(str
    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);
    @@ -1511,18 +1512,21 @@ static int __devinit usbvision_probe(str
    __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)
    @@ -1541,8 +1545,8 @@ static int __devinit usbvision_probe(str
    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++) {
    @@ -1577,6 +1581,12 @@ static int __devinit usbvision_probe(str

    PDEBUG(DBG_PROBE, "success");
    return 0;
    +
    +err_pkt:
    + usbvision_release(usbvision);
    +err_usb:
    + usb_put_dev(dev);
    + return ret;
    }


    \
     
     \ /
      Last update: 2016-02-09 01:41    [W:4.021 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site