diff options
| author | Johan Hovold <johan@kernel.org> | 2016-10-21 13:56:27 +0300 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-11-24 05:54:57 +0300 |
| commit | b6304f09377d88819e8856d9fad574ebe4e2239f (patch) | |
| tree | 1eb5aedbeeb8b6f18f18b927c12bdbe551aedf98 | |
| parent | e42afd00e43cb13dafcfc9256471d342fb185cf1 (diff) | |
| download | linux-b6304f09377d88819e8856d9fad574ebe4e2239f.tar.xz | |
USB: serial: fix potential NULL-dereference at probe
[ Upstream commit 126d26f66d9890a69158812a6caa248c05359daa ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index d3bf8348e638..a290891ddd84 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -1061,7 +1061,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; |