This is a note to let you know that I've just added the patch titled
USB: mct_u232: add sanity checking in probe
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-mct_u232-add-sanity-checking-in-probe.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4e9a0b05257f29cf4b75f3209243ed71614d062e Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oneukum@xxxxxxxx>
Date: Thu, 31 Mar 2016 12:04:24 -0400
Subject: USB: mct_u232: add sanity checking in probe
From: Oliver Neukum <oneukum@xxxxxxxx>
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
Signed-off-by: Oliver Neukum <ONeukum@xxxxxxxx>
[johan: add error message ]
Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/usb/serial/mct_u232.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- 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
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);
Patches currently in stable-queue which might be from oneukum@xxxxxxxx are
queue-4.5/usb-cdc-acm-more-sanity-checking.patch
queue-4.5/usb-mct_u232-add-sanity-checking-in-probe.patch
queue-4.5/usb-digi_acceleport-do-sanity-checking-for-the-number-of-ports.patch
queue-4.5/usb-cypress_m8-add-endpoint-sanity-check.patch
queue-4.5/usb-retry-reset-if-a-device-times-out.patch
queue-4.5/usb-hub-fix-a-typo-in-hub_port_init-leading-to-wrong-logic.patch
queue-4.5/usb-usb_driver_claim_interface-add-sanity-checking.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html