diff options
| author | Oliver Neukum <oneukum@suse.com> | 2016-03-31 12:04:25 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-04-11 16:44:07 +0200 |
| commit | 4a77ba7a4e8567821f3e77054f23b3daade25999 (patch) | |
| tree | c1eef5f2e0a515681a4b87f196385465ef2eac87 /drivers/usb | |
| parent | cd4d737344639d7225d0232ec99a1b833d7e2324 (diff) | |
| download | lwn-4a77ba7a4e8567821f3e77054f23b3daade25999.tar.gz lwn-4a77ba7a4e8567821f3e77054f23b3daade25999.zip | |
USB: cypress_m8: add endpoint sanity check
commit c55aee1bf0e6b6feec8b2927b43f7a09a6d5f754 upstream.
An attack using missing endpoints exists.
CVE-2016-3137
Signed-off-by: Oliver Neukum <ONeukum@suse.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/cypress_m8.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index 558605d646f3..ba96eeed1bab 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c @@ -449,6 +449,11 @@ static int cypress_generic_port_probe(struct usb_serial_port *port) struct usb_serial *serial = port->serial; struct cypress_private *priv; + if (!port->interrupt_out_urb || !port->interrupt_in_urb) { + dev_err(&port->dev, "required endpoint is missing\n"); + return -ENODEV; + } + priv = kzalloc(sizeof(struct cypress_private), GFP_KERNEL); if (!priv) return -ENOMEM; @@ -608,12 +613,6 @@ static int cypress_open(struct tty_struct *tty, struct usb_serial_port *port) cypress_set_termios(tty, port, &priv->tmp_termios); /* setup the port and start reading from the device */ - if (!port->interrupt_in_urb) { - dev_err(&port->dev, "%s - interrupt_in_urb is empty!\n", - __func__); - return -1; - } - usb_fill_int_urb(port->interrupt_in_urb, serial->dev, usb_rcvintpipe(serial->dev, port->interrupt_in_endpointAddress), port->interrupt_in_urb->transfer_buffer, |