diff options
| author | Alexey Khoroshilov | 2013-06-03 03:58:49 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-06-17 20:52:20 +0200 |
| commit | e049ca5e854263c821a15c0e25fe2ae202c365e1 (patch) | |
| tree | 9cd30b2a350ef938323f87c7ced98411f5446066 /drivers/staging | |
| parent | [media] pvrusb2: Cocci spatch "memdup.spatch" (diff) | |
| download | kernel-qcow2-linux-e049ca5e854263c821a15c0e25fe2ae202c365e1.tar.gz kernel-qcow2-linux-e049ca5e854263c821a15c0e25fe2ae202c365e1.tar.xz kernel-qcow2-linux-e049ca5e854263c821a15c0e25fe2ae202c365e1.zip | |
[media] staging/media: lirc_imon: fix leaks in imon_probe()
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/lirc/lirc_imon.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c index 0a2c45dd4475..4afa7da11f37 100644 --- a/drivers/staging/media/lirc/lirc_imon.c +++ b/drivers/staging/media/lirc/lirc_imon.c @@ -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; |