]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
[media] radio-si470x: fix memory leak in si470x_usb_driver_probe()
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Tue, 31 May 2011 20:54:40 +0000 (17:54 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jul 2011 20:52:21 +0000 (17:52 -0300)
radio->int_in_urb is not deallocated on error paths in si470x_usb_driver_probe().

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

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/radio/si470x/radio-si470x-usb.c

index 392e84fe90ef9f4c1ffee33c99197f776ad338b6..ccefdaea4dc5e73f2a34478ae6b231f3fe0af51c 100644 (file)
@@ -699,7 +699,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
        radio->videodev = video_device_alloc();
        if (!radio->videodev) {
                retval = -ENOMEM;
-               goto err_intbuffer;
+               goto err_urb;
        }
        memcpy(radio->videodev, &si470x_viddev_template,
                        sizeof(si470x_viddev_template));
@@ -790,6 +790,8 @@ err_all:
        kfree(radio->buffer);
 err_video:
        video_device_release(radio->videodev);
+err_urb:
+       usb_free_urb(radio->int_in_urb);
 err_intbuffer:
        kfree(radio->int_in_buffer);
 err_radio: