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

Commit 3e2aac36 authored by Henk Vergonet's avatar Henk Vergonet Committed by Greg Kroah-Hartman
Browse files

USB: Fix unload oops and memory leak in yealink driver 



This patch fixes a memory leak and a kernel oops when trying to unload
the driver, due to an unbalanced cleanup.
Thanks Ivar Jensen for spotting my mistake.

Signed-off-by: default avatarHenk Vergonet <henk.vergonet@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 59925838

drivers/usb/input/yealink.c

+6 −6
Original line number Diff line number Diff line
@@ -810,12 +810,9 @@ static int usb_cleanup(struct yealink_dev *yld, int err) 
	if (yld == NULL)

		return err;



        if (yld->urb_irq) {

		usb_kill_urb(yld->urb_irq);

		usb_free_urb(yld->urb_irq);

	}

        if (yld->urb_ctl)

		usb_free_urb(yld->urb_ctl);

	usb_kill_urb(yld->urb_irq);	/* parameter validation in core/urb */

	usb_kill_urb(yld->urb_ctl);	/* parameter validation in core/urb */



        if (yld->idev) {

		if (err)

			input_free_device(yld->idev);
@@ -831,6 +828,9 @@ static int usb_cleanup(struct yealink_dev *yld, int err) 
	if (yld->irq_data)

		usb_buffer_free(yld->udev, USB_PKT_LEN,

				yld->irq_data, yld->irq_dma);



	usb_free_urb(yld->urb_irq);	/* parameter validation in core/urb */

	usb_free_urb(yld->urb_ctl);	/* parameter validation in core/urb */

	kfree(yld);

	return err;

}