mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-09-30 05:05:47 +00:00
54 lines
1.7 KiB
Plaintext
54 lines
1.7 KiB
Plaintext
From 2633b8df3dff0377066fb32feb8ef06ae834d7ff Mon Sep 17 00:00:00 2001
|
|
From: Badhri Jagan Sridharan <Badhri@google.com>
|
|
Date: Tue, 30 Aug 2016 13:33:55 -0700
|
|
Subject: UPSTREAM: USB: mct_u232: add sanity checking in probe
|
|
|
|
commit 4e9a0b05257f29cf4b75f3209243ed71614d062e upstream.
|
|
|
|
An attack using the lack of sanity checking in probe is known. This
|
|
patch checks for the existence of a second port.
|
|
|
|
CVE-2016-3136
|
|
BUG: 28242610
|
|
Signed-off-by: Oliver Neukum <ONeukum@suse.com>
|
|
[johan: add error message ]
|
|
Signed-off-by: Johan Hovold <johan@kernel.org>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
|
|
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
|
|
Change-Id: I284ad648c2087c34a098d67e0cc6d948a568413c
|
|
---
|
|
drivers/usb/serial/mct_u232.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
|
|
index 6a15adf..c14c29f 100644
|
|
--- a/drivers/usb/serial/mct_u232.c
|
|
+++ b/drivers/usb/serial/mct_u232.c
|
|
@@ -377,14 +377,21 @@ static void mct_u232_msr_to_state(struct usb_serial_port *port,
|
|
|
|
static int mct_u232_port_probe(struct usb_serial_port *port)
|
|
{
|
|
+ struct usb_serial *serial = port->serial;
|
|
struct mct_u232_private *priv;
|
|
|
|
+ /* check first to simplify error handling */
|
|
+ if (!serial->port[1] || !serial->port[1]->interrupt_in_urb) {
|
|
+ dev_err(&port->dev, "expected endpoint missing\n");
|
|
+ return -ENODEV;
|
|
+ }
|
|
+
|
|
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
|
|
if (!priv)
|
|
return -ENOMEM;
|
|
|
|
/* Use second interrupt-in endpoint for reading. */
|
|
- priv->read_urb = port->serial->port[1]->interrupt_in_urb;
|
|
+ priv->read_urb = serial->port[1]->interrupt_in_urb;
|
|
priv->read_urb->context = port;
|
|
|
|
spin_lock_init(&priv->lock);
|
|
--
|
|
cgit v1.1
|
|
|