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

Commit c8d62957 authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: serial: io_edgeport: fix memory leaks in probe error path 



URBs and buffers allocated in attach for Epic devices would never be
deallocated in case of a later probe error (e.g. failure to allocate
minor numbers) as disconnect is then never called.

Fix by moving deallocation to release and making sure that the
URBs are first unlinked.

Fixes: f9c99bb8 ("USB: usb-serial: replace shutdown with disconnect,
release")
Cc: stable <stable@vger.kernel.org>	# v2.6.31
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c5c0c555

drivers/usb/serial/io_edgeport.c

+10 −7
Original line number Original line Diff line number Diff line
@@ -2959,16 +2959,9 @@ static void edge_disconnect(struct usb_serial *serial) 
{

{

	struct edgeport_serial *edge_serial = usb_get_serial_data(serial);

	struct edgeport_serial *edge_serial = usb_get_serial_data(serial);





	/* stop reads and writes on all ports */

	/* free up our endpoint stuff */

	if (edge_serial->is_epic) {

	if (edge_serial->is_epic) {

		usb_kill_urb(edge_serial->interrupt_read_urb);

		usb_kill_urb(edge_serial->interrupt_read_urb);

		usb_free_urb(edge_serial->interrupt_read_urb);

		kfree(edge_serial->interrupt_in_buffer);



		usb_kill_urb(edge_serial->read_urb);

		usb_kill_urb(edge_serial->read_urb);

		usb_free_urb(edge_serial->read_urb);

		kfree(edge_serial->bulk_in_buffer);

	}

	}

}

}
@@ -2981,6 +2974,16 @@ static void edge_release(struct usb_serial *serial) 
{

{

	struct edgeport_serial *edge_serial = usb_get_serial_data(serial);

	struct edgeport_serial *edge_serial = usb_get_serial_data(serial);





	if (edge_serial->is_epic) {

		usb_kill_urb(edge_serial->interrupt_read_urb);

		usb_free_urb(edge_serial->interrupt_read_urb);

		kfree(edge_serial->interrupt_in_buffer);



		usb_kill_urb(edge_serial->read_urb);

		usb_free_urb(edge_serial->read_urb);

		kfree(edge_serial->bulk_in_buffer);

	}



	kfree(edge_serial);

	kfree(edge_serial);

}

}