USB: serial: pl2303: fix NULL-deref at open
authorJohan Hovold <johan@kernel.org>
Tue, 3 Jan 2017 15:40:00 +0000 (16:40 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 16 Mar 2017 02:18:38 +0000 (02:18 +0000)
commit 76ab439ed1b68778e9059c79ecc5d14de76c89a8 upstream.

Fix NULL-pointer dereference in open() should a type-0 or type-1 device
lack the expected endpoints:

Unable to handle kernel NULL pointer dereference at virtual address 00000030
...
PC is at pl2303_open+0x38/0xec [pl2303]

Note that a missing interrupt-in endpoint would have caused open() to
fail.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/usb/serial/pl2303.c

index a440387..c23f716 100644 (file)
@@ -185,10 +185,18 @@ static int pl2303_vendor_write(__u16 value, __u16 index,
 static int pl2303_startup(struct usb_serial *serial)
 {
        struct pl2303_private *priv;
 static int pl2303_startup(struct usb_serial *serial)
 {
        struct pl2303_private *priv;
+       unsigned char num_ports = serial->num_ports;
        enum pl2303_type type = type_0;
        unsigned char *buf;
        int i;
 
        enum pl2303_type type = type_0;
        unsigned char *buf;
        int i;
 
+       if (serial->num_bulk_in < num_ports ||
+                       serial->num_bulk_out < num_ports ||
+                       serial->num_interrupt_in < num_ports) {
+               dev_err(&serial->interface->dev, "missing endpoints\n");
+               return -ENODEV;
+       }
+
        buf = kmalloc(10, GFP_KERNEL);
        if (buf == NULL)
                return -ENOMEM;
        buf = kmalloc(10, GFP_KERNEL);
        if (buf == NULL)
                return -ENOMEM;