Commit e049ca5e authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Mauro Carvalho Chehab

[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: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 07342664
...@@ -911,8 +911,8 @@ static int imon_probe(struct usb_interface *interface, ...@@ -911,8 +911,8 @@ static int imon_probe(struct usb_interface *interface,
if (retval) { if (retval) {
dev_err(dev, "%s: usb_submit_urb failed for intf0 (%d)\n", dev_err(dev, "%s: usb_submit_urb failed for intf0 (%d)\n",
__func__, retval); __func__, retval);
mutex_unlock(&context->ctx_lock); alloc_status = 8;
goto exit; goto unlock;
} }
usb_set_intfdata(interface, context); usb_set_intfdata(interface, context);
...@@ -937,6 +937,8 @@ static int imon_probe(struct usb_interface *interface, ...@@ -937,6 +937,8 @@ static int imon_probe(struct usb_interface *interface,
alloc_status_switch: alloc_status_switch:
switch (alloc_status) { switch (alloc_status) {
case 8:
lirc_unregister_driver(driver->minor);
case 7: case 7:
usb_free_urb(tx_urb); usb_free_urb(tx_urb);
case 6: case 6:
...@@ -959,7 +961,6 @@ static int imon_probe(struct usb_interface *interface, ...@@ -959,7 +961,6 @@ static int imon_probe(struct usb_interface *interface,
retval = 0; retval = 0;
} }
exit:
mutex_unlock(&driver_lock); mutex_unlock(&driver_lock);
return retval; return retval;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment