Skip to contentSkip to conversation

patch "USB: serial: keyspan: fix use-after-free in probe error path" added to usb-next

PATCH [email protected] 1 participant 1 message May 14, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

USB: serial: keyspan: fix use-after-free in probe error path

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-next branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will also be merged in the next major kernel release during the merge window.

If you have any questions about this process, please let me know.

Quoted 1 line

From 35be1a71d70775e7bd7e45fa6d2897342ff4c9d2 Mon Sep 17 00:00:00 2001

From: Johan Hovold <[email protected]>
Date: Sun, 8 May 2016 20:07:58 +0200
Subject: USB: serial: keyspan: fix use-after-free in probe error path

The interface instat and indat URBs were submitted in attach, but never unlinked in release before deallocating the corresponding transfer buffers.

In the case of a late probe error (e.g. due to failed minor allocation), disconnect would not have been called before release, causing the buffers to be freed while the URBs are still in use. We'd also end up with active URBs for an unbound interface.

Fixes f9c99bb8b3a1 ("USB: usb-serial: replace shutdown with disconnect,

release")

---
 drivers/usb/serial/keyspan.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/usb/serial/keyspan.c +4 -0
index b6bd8e4a6486..1cf05883f48c 100644
@@ -2376,6 +2376,10 @@ static void keyspan_release(struct usb_serial *serial)
 
 	s_priv = usb_get_serial_data(serial);
 
+	/* Make sure to unlink the URBs submitted in attach. */
+	usb_kill_urb(s_priv->instat_urb);
+	usb_kill_urb(s_priv->indat_urb);
+
 	usb_free_urb(s_priv->instat_urb);
 	usb_free_urb(s_priv->indat_urb);
 	usb_free_urb(s_priv->glocont_urb);
Signature · 1 line
2.8.2