Commit 4b8d00f5 authored by Oliver Neukum's avatar Oliver Neukum Committed by Sasha Levin

USB: mct_u232: add sanity checking in probe

[ Upstream commit 4e9a0b05 ]

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: default avatarOliver Neukum <ONeukum@suse.com>
CC: stable@vger.kernel.org
[johan: add error message ]
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 6b659bbd
...@@ -376,14 +376,21 @@ static void mct_u232_msr_to_state(struct usb_serial_port *port, ...@@ -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) static int mct_u232_port_probe(struct usb_serial_port *port)
{ {
struct usb_serial *serial = port->serial;
struct mct_u232_private *priv; 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); priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
/* Use second interrupt-in endpoint for reading. */ /* 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; priv->read_urb->context = port;
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment