Patch "USB: serial: io_edgeport: fix memory leaks in probe error path" has been added to the 4.6-stable tree

This is a note to let you know that I've just added the patch titled

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

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
usb-serial-io_edgeport-fix-memory-leaks-in-probe-error-path.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Johan Hovold <[email protected]>
Date: Sun, 8 May 2016 20:07:57 +0200
Subject: USB: serial: io_edgeport: fix memory leaks in probe error path

From: Johan Hovold <[email protected]>

commit c8d62957d450cc1a22ce3242908709fe367ddc8e upstream.

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.

release")

---
 drivers/usb/serial/io_edgeport.c |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

@@ -2959,16 +2959,9 @@ static void edge_disconnect(struct usb_s
 {
 	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) {
 		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);
 	}
 }
 

@@ -2981,6 +2974,16 @@ static void edge_release(struct usb_seri
 {
 	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);
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/usb-serial-quatech2-fix-use-after-free-in-probe-error-path.patch queue-4.6/usb-serial-option-add-support-for-cinterion-ph8-and-ahxx.patch queue-4.6/usb-serial-io_edgeport-fix-memory-leaks-in-attach-error-path.patch queue-4.6/usb-serial-mxuport-fix-use-after-free-in-probe-error-path.patch queue-4.6/usb-serial-option-add-even-more-zte-device-ids.patch queue-4.6/usb-serial-keyspan-fix-use-after-free-in-probe-error-path.patch queue-4.6/usb-serial-cp210x-fix-hardware-flow-control-disable.patch queue-4.6/usb-serial-option-add-more-zte-device-ids.patch queue-4.6/usb-serial-io_edgeport-fix-memory-leaks-in-probe-error-path.patch