Patch "USB: serial: keyspan_pda: verify endpoints at probe" has been added to the 4.4-stable tree

Patch "USB: serial: keyspan_pda: verify endpoints at probe" has been added to the 4.4-stable tree

[gregkh]

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

    USB: serial: keyspan_pda: verify endpoints at probe

to the 4.4-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-keyspan_pda-verify-endpoints-at-probe.patch
and it can be found in the queue-4.4 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 5d9b0f859babe96175cd33d7162a9463a875ffde Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Tue, 3 Jan 2017 16:39:48 +0100
Subject: USB: serial: keyspan_pda: verify endpoints at probe

From: Johan Hovold <johan@kernel.org>

commit 5d9b0f859babe96175cd33d7162a9463a875ffde upstream.

Check for the expected endpoints in attach() and fail loudly if not
present.

Note that failing to do this appears to be benign since da280e348866
("USB: keyspan_pda: clean up write-urb busy handling") which prevents a
NULL-pointer dereference in write() by never marking a non-existent
write-urb as free.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -699,6 +699,19 @@ MODULE_FIRMWARE("keyspan_pda/keyspan_pda
 MODULE_FIRMWARE("keyspan_pda/xircom_pgs.fw");
 #endif
 
+static int keyspan_pda_attach(struct usb_serial *serial)
+{
+	unsigned char num_ports = serial->num_ports;
+
+	if (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 keyspan_pda_port_probe(struct usb_serial_port *port)
 {
 
@@ -776,6 +789,7 @@ static struct usb_serial_driver keyspan_
 	.break_ctl =		keyspan_pda_break_ctl,
 	.tiocmget =		keyspan_pda_tiocmget,
 	.tiocmset =		keyspan_pda_tiocmset,
+	.attach =		keyspan_pda_attach,
 	.port_probe =		keyspan_pda_port_probe,
 	.port_remove =		keyspan_pda_port_remove,
 };


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

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