mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-30 01:46:30 -05:00
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
|
From 4e9a0b05257f29cf4b75f3209243ed71614d062e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Oliver Neukum <oneukum@suse.com>
|
||
|
|
Date: Thu, 31 Mar 2016 12:04:24 -0400
|
||
|
|
Subject: USB: mct_u232: add sanity checking in probe
|
||
|
|
|
||
|
|
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
|
||
|
|
|
||
|
|
Signed-off-by: Oliver Neukum <ONeukum@suse.com>
|
||
|
|
CC: stable@vger.kernel.org
|
||
|
|
[johan: add error message ]
|
||
|
|
Signed-off-by: Johan Hovold <johan@kernel.org>
|
||
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||
|
|
---
|
||
|
|
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 4446b8d..8856553 100644
|
||
|
|
--- a/drivers/usb/serial/mct_u232.c
|
||
|
|
+++ b/drivers/usb/serial/mct_u232.c
|
||
|
|
@@ -376,14 +376,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
|
||
|
|
|