Patch "USB: serial: oti6858: fix NULL-deref at open" has been added to the 4.9-stable tree

Patch "USB: serial: oti6858: fix NULL-deref at open" has been added to the 4.9-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    USB: serial: oti6858: fix NULL-deref at open

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     usb-serial-oti6858-fix-null-deref-at-open.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 5afeef2366db14587b65558bbfd5a067542e07fb Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Tue, 3 Jan 2017 16:39:59 +0100
Subject: USB: serial: oti6858: fix NULL-deref at open

From: Johan Hovold <johan@kernel.org>

commit 5afeef2366db14587b65558bbfd5a067542e07fb upstream.

Fix NULL-pointer dereference in open() should the device lack the
expected endpoints:

Unable to handle kernel NULL pointer dereference at virtual address 00000030
...
PC is at oti6858_open+0x30/0x1d0 [oti6858]

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

Fixes: 49cdee0ed0fc ("USB: oti6858 usb-serial driver (in Nokia CA-42
cable)")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/usb/serial/oti6858.c |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -134,6 +134,7 @@ static int oti6858_chars_in_buffer(struc
 static int oti6858_tiocmget(struct tty_struct *tty);
 static int oti6858_tiocmset(struct tty_struct *tty,
 				unsigned int set, unsigned int clear);
+static int oti6858_attach(struct usb_serial *serial);
 static int oti6858_port_probe(struct usb_serial_port *port);
 static int oti6858_port_remove(struct usb_serial_port *port);
 
@@ -158,6 +159,7 @@ static struct usb_serial_driver oti6858_
 	.write_bulk_callback =	oti6858_write_bulk_callback,
 	.write_room =		oti6858_write_room,
 	.chars_in_buffer =	oti6858_chars_in_buffer,
+	.attach =		oti6858_attach,
 	.port_probe =		oti6858_port_probe,
 	.port_remove =		oti6858_port_remove,
 };
@@ -324,6 +326,20 @@ static void send_data(struct work_struct
 	usb_serial_port_softint(port);
 }
 
+static int oti6858_attach(struct usb_serial *serial)
+{
+	unsigned char num_ports = serial->num_ports;
+
+	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;
+	}
+
+	return 0;
+}
+
 static int oti6858_port_probe(struct usb_serial_port *port)
 {
 	struct oti6858_private *priv;


Patches currently in stable-queue which might be from johan@kernel.org are

queue-4.9/usb-serial-io_ti-fix-i-o-after-disconnect.patch
queue-4.9/usb-serial-ti_usb_3410_5052-fix-null-deref-at-open.patch
queue-4.9/usb-serial-kobil_sct-fix-null-deref-in-write.patch
queue-4.9/usb-serial-spcp8x5-fix-null-deref-at-open.patch
queue-4.9/usb-serial-mos7720-fix-parallel-probe.patch
queue-4.9/usb-serial-cyberjack-fix-null-deref-at-open.patch
queue-4.9/usb-serial-mos7720-fix-null-deref-at-open.patch
queue-4.9/usb-serial-garmin_gps-fix-memory-leak-on-failed-urb-submit.patch
queue-4.9/usb-serial-io_ti-fix-null-deref-at-open.patch
queue-4.9/usb-serial-pl2303-fix-null-deref-at-open.patch
queue-4.9/usb-serial-quatech2-fix-sleep-while-atomic-in-close.patch
queue-4.9/usb-serial-iuu_phoenix-fix-null-deref-at-open.patch
queue-4.9/usb-serial-oti6858-fix-null-deref-at-open.patch
queue-4.9/usb-serial-io_edgeport-fix-null-deref-at-open.patch
queue-4.9/usb-serial-mos7720-fix-parport-use-after-free-on-probe-errors.patch
queue-4.9/usb-serial-mos7720-fix-use-after-free-on-probe-errors.patch
queue-4.9/usb-serial-mos7840-fix-null-deref-at-open.patch
queue-4.9/usb-serial-omninet-fix-null-derefs-at-open-and-disconnect.patch
queue-4.9/usb-serial-keyspan_pda-verify-endpoints-at-probe.patch
queue-4.9/usb-serial-io_ti-fix-another-null-deref-at-open.patch