Patch "USB: usbtmc: add missing endpoint sanity check" has been added to the 4.10-stable tree

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

USB: usbtmc: add missing endpoint sanity check

to the 4.10-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-usbtmc-add-missing-endpoint-sanity-check.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Johan Hovold <[email protected]>
Date: Tue, 14 Mar 2017 17:55:45 +0100
Subject: USB: usbtmc: add missing endpoint sanity check

From: Johan Hovold <[email protected]>

commit 687e0687f71ec00e0132a21fef802dee88c2f1ad upstream.

USBTMC devices are required to have a bulk-in and a bulk-out endpoint, but the driver failed to verify this, something which could lead to the endpoint addresses being taken from uninitialised memory.

Make sure to zero all private data as part of allocation, and add the missing endpoint sanity check.

Note that this also addresses a more recently introduced issue, where the interrupt-in-presence flag would also be uninitialised whenever the optional interrupt-in endpoint is not present. This in turn could lead to an interrupt urb being allocated, initialised and submitted based on uninitialised values.

---
 drivers/usb/class/usbtmc.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

@@ -1381,7 +1381,7 @@ static int usbtmc_probe(struct usb_inter
 
 	dev_dbg(&intf->dev, "%s called\n", __func__);
 
-	data = kmalloc(sizeof(*data), GFP_KERNEL);
+	data = kzalloc(sizeof(*data), GFP_KERNEL);
 	if (!data)
 		return -ENOMEM;
 

@@ -1444,6 +1444,13 @@ static int usbtmc_probe(struct usb_inter
 			break;
 		}
 	}
+
+	if (!data->bulk_out || !data->bulk_in) {
+		dev_err(&intf->dev, "bulk endpoints not found\n");
+		retcode = -ENODEV;
+		goto err_put;
+	}
+
 	/* Find int endpoint */
 	for (n = 0; n < iface_desc->desc.bNumEndpoints; n++) {
 		endpoint = &iface_desc->endpoint[n].desc;

@@ -1512,6 +1519,7 @@ error_register:
 	sysfs_remove_group(&intf->dev.kobj, &capability_attr_grp);
 	sysfs_remove_group(&intf->dev.kobj, &data_attr_grp);
 	usbtmc_free_int(data);
+err_put:
 	kref_put(&data->kref, usbtmc_delete);
 	return retcode;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/usb-serial-option-add-quectel-uc15-uc20-ec21-and-ec25-modems.patch queue-4.10/input-ims-pcu-validate-number-of-endpoints-before-using-them.patch queue-4.10/usb-usbtmc-add-missing-endpoint-sanity-check.patch queue-4.10/input-cm109-validate-number-of-endpoints-before-using-them.patch queue-4.10/input-iforce-validate-number-of-endpoints-before-using-them.patch queue-4.10/mmc-ushc-fix-null-deref-at-probe.patch queue-4.10/input-kbtab-validate-number-of-endpoints-before-using-them.patch queue-4.10/usb-usbtmc-fix-probe-error-path.patch queue-4.10/input-sur40-validate-number-of-endpoints-before-using-them.patch queue-4.10/uwb-i1480-dfu-fix-null-deref-at-probe.patch queue-4.10/input-hanwang-validate-number-of-endpoints-before-using-them.patch queue-4.10/usb-idmouse-fix-null-deref-at-probe.patch queue-4.10/uwb-hwa-rc-fix-null-deref-at-probe.patch queue-4.10/usb-lvtest-fix-null-deref-at-probe.patch queue-4.10/input-yealink-validate-number-of-endpoints-before-using-them.patch queue-4.10/usb-serial-qcserial-add-dell-dw5811e.patch queue-4.10/usb-uss720-fix-null-deref-at-probe.patch queue-4.10/usb-wusbcore-fix-null-deref-at-probe.patch