From: Johan Hovold <johan@kernel.org>
Date: Fri, 21 Oct 2016 10:56:27 +0000 (+0200)
Subject: USB: serial: fix potential NULL-dereference at probe
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=126d26f66d9890a69158812a6caa248c05359daa;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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;