summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2016-10-21 12:56:27 +0200
committerJohan Hovold <johan@kernel.org>2016-10-21 16:47:17 +0200
commit126d26f66d9890a69158812a6caa248c05359daa (patch)
treea0ea2a08cb65b6cac7b91a147edab37976538bb6 /drivers/usb
parentUSB: serial: cp210x: fix tiocmget error handling (diff)
downloadlinux-126d26f66d9890a69158812a6caa248c05359daa.tar.xz
linux-126d26f66d9890a69158812a6caa248c05359daa.zip
USB: serial: fix potential NULL-dereference at probe
Make sure we have at least one port before attempting to register a console. Currently, at least one driver binds to a "dummy" interface and requests zero ports for it. Should such an interface also lack endpoints, we get a NULL-deref during probe. Fixes: e5b1e2062e05 ("USB: serial: make minor allocation dynamic") Cc: stable <stable@vger.kernel.org> # 3.11 Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/usb-serial.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index d213cf44a7e4..4a037b4a79cf 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1078,7 +1078,8 @@ static int usb_serial_probe(struct usb_interface *interface,
serial->disconnected = 0;
- usb_serial_console_init(serial->port[0]->minor);
+ if (num_ports > 0)
+ usb_serial_console_init(serial->port[0]->minor);
exit:
module_put(type->driver.owner);
return 0;