aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2016-05-08 20:07:58 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-01 12:12:47 -0700
commitfaa611341c9661b77b5a086d19c2511b0305a2e5 (patch)
tree2990703227aab4fd8ecf85d5c42962406165fc15
parent37d2056c8dbe8b7727f684eb171d537a565d8a95 (diff)
downloadlinux-yocto-faa611341c9661b77b5a086d19c2511b0305a2e5.tar.gz
linux-yocto-faa611341c9661b77b5a086d19c2511b0305a2e5.tar.bz2
linux-yocto-faa611341c9661b77b5a086d19c2511b0305a2e5.zip
USB: serial: keyspan: fix use-after-free in probe error path
commit 35be1a71d70775e7bd7e45fa6d2897342ff4c9d2 upstream. 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") Signed-off-by: Johan Hovold <johan@kernel.org> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/keyspan.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 35297a845a63..118dba285b5d 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -2406,6 +2406,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);