[media] staging/media: lirc_imon: fix leaks in imon_probe()
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Mon, 3 Jun 2013 01:58:49 +0000 (22:58 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 17 Jun 2013 18:52:20 +0000 (15:52 -0300)
Error handling of usb_submit_urb() is not as all others in imon_probe().
It just unlocks mutexes and returns nonzero leaving all already
allocated resources unfreed.
The patch makes sure all the resources are deallocated.
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/staging/media/lirc/lirc_imon.c

index 0a2c45dd44756a514d9ab3f0dea5f3c5b82dd89f..4afa7da11f375cfbbf9e08f0df0676dfae62302d 100644 (file)
@@ -911,8 +911,8 @@ static int imon_probe(struct usb_interface *interface,
        if (retval) {
                dev_err(dev, "%s: usb_submit_urb failed for intf0 (%d)\n",
                        __func__, retval);
-               mutex_unlock(&context->ctx_lock);
-               goto exit;
+               alloc_status = 8;
+               goto unlock;
        }
 
        usb_set_intfdata(interface, context);
@@ -937,6 +937,8 @@ unlock:
 alloc_status_switch:
 
        switch (alloc_status) {
+       case 8:
+               lirc_unregister_driver(driver->minor);
        case 7:
                usb_free_urb(tx_urb);
        case 6:
@@ -959,7 +961,6 @@ alloc_status_switch:
                retval = 0;
        }
 
-exit:
        mutex_unlock(&driver_lock);
 
        return retval;