Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/staging/media/lirc/lirc_imon.c

+4 −3
Original line number Diff line number Diff line
@@ -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 @@ static int imon_probe(struct usb_interface *interface, 
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 @@ static int imon_probe(struct usb_interface *interface, 
		retval = 0;

	}



exit:

	mutex_unlock(&driver_lock);



	return retval;