From: Johan Hovold <johan@kernel.org>
To: linux-usb@vger.kernel.org
Cc: stable@vger.kernel.org, Johan Hovold <johan@kernel.org>
Subject: [PATCH 6/8] USB: serial: mxuport: fix use-after-free in probe error path
Date: Sun, 8 May 2016 20:08:01 +0200 [thread overview]
Message-ID: <1462730883-9025-7-git-send-email-johan@kernel.org> (raw)
In-Reply-To: <1462730883-9025-1-git-send-email-johan@kernel.org>
The interface read and event URBs are submitted in attach, but were
never explicitly unlinked by the driver. Instead the URBs would have
been killed by usb-serial core on disconnect.
In case of a late probe error (e.g. due to failed minor allocation),
disconnect is never called and we could end up with active URBs for an
unbound interface. This in turn could lead to deallocated memory being
dereferenced in the completion callbacks.
Fixes: ee467a1f2066 ("USB: serial: add Moxa UPORT 12XX/14XX/16XX
driver")
Cc: stable <stable@vger.kernel.org> # v3.14
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/serial/mxuport.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/usb/serial/mxuport.c b/drivers/usb/serial/mxuport.c
index 31a8b47f1ac6..c6596cbcc4b6 100644
--- a/drivers/usb/serial/mxuport.c
+++ b/drivers/usb/serial/mxuport.c
@@ -1259,6 +1259,15 @@ static int mxuport_attach(struct usb_serial *serial)
return 0;
}
+static void mxuport_release(struct usb_serial *serial)
+{
+ struct usb_serial_port *port0 = serial->port[0];
+ struct usb_serial_port *port1 = serial->port[1];
+
+ usb_serial_generic_close(port1);
+ usb_serial_generic_close(port0);
+}
+
static int mxuport_open(struct tty_struct *tty, struct usb_serial_port *port)
{
struct mxuport_port *mxport = usb_get_serial_port_data(port);
@@ -1361,6 +1370,7 @@ static struct usb_serial_driver mxuport_device = {
.probe = mxuport_probe,
.port_probe = mxuport_port_probe,
.attach = mxuport_attach,
+ .release = mxuport_release,
.calc_num_ports = mxuport_calc_num_ports,
.open = mxuport_open,
.close = mxuport_close,
--
2.7.3
next prev parent reply other threads:[~2016-05-08 18:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-08 18:07 [PATCH 0/8] USB: serial: fix interface URB leaks and use-after-free Johan Hovold
2016-05-08 18:07 ` [PATCH 1/8] USB: serial: io_edgeport: fix memory leaks in attach error path Johan Hovold
2016-05-08 18:07 ` [PATCH 2/8] USB: serial: io_edgeport: fix memory leaks in probe " Johan Hovold
2016-05-08 18:07 ` [PATCH 3/8] USB: serial: keyspan: fix use-after-free " Johan Hovold
2016-05-08 18:07 ` [PATCH 4/8] USB: serial: keyspan: fix URB unlink Johan Hovold
2016-05-08 18:08 ` [PATCH 5/8] USB: serial: keyspan: fix debug and error messages Johan Hovold
2016-05-08 18:08 ` Johan Hovold [this message]
2016-05-08 18:08 ` [PATCH 7/8] USB: serial: quatech2: fix use-after-free in probe error path Johan Hovold
2016-05-08 18:08 ` [PATCH 8/8] USB: serial: fix minor-number allocation Johan Hovold
2016-05-09 5:26 ` Greg KH
2016-05-10 7:45 ` Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462730883-9025-7-git-send-email-johan@kernel.org \
--to=johan@kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.