diff options
| author | Johan Hovold <johan@kernel.org> | 2016-05-08 20:07:58 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-06-15 09:32:06 +0200 |
| commit | 46e8b7f747e086a5ec3f93350dcae4a45450032c (patch) | |
| tree | b8cab9a67414ddb2a9c19a77b7127dbd61d779ff /drivers/usb | |
| parent | aad7758adca5d92a7ad06b43271c5c045a445c98 (diff) | |
| download | lwn-46e8b7f747e086a5ec3f93350dcae4a45450032c.tar.gz lwn-46e8b7f747e086a5ec3f93350dcae4a45450032c.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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/keyspan.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index e58e21b46ef0..5419ccc72428 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c @@ -2411,6 +2411,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); |