Patch "USB: usbtmc: fix probe error path" has been added to the 4.9-stable tree

[<gregkh@linuxfoundation.org>]

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

    USB: usbtmc: fix probe error path

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-usbtmc-fix-probe-error-path.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 2e47c53503eb9faff42b3cfa144a833344dd1f89 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Tue, 14 Mar 2017 17:55:46 +0100
Subject: USB: usbtmc: fix probe error path

From: Johan Hovold <johan@kernel.org>

commit 2e47c53503eb9faff42b3cfa144a833344dd1f89 upstream.

Make sure to initialise the return value to avoid having allocation
failures going unnoticed when allocating interrupt-endpoint resources.

This prevents use-after-free or worse when the device is later unbound.

Fixes: dbf3e7f654c0 ("Implement an ioctl to support the USMTMC-USB488 READ_STATUS_BYTE operation.")
Cc: Dave Penkler <dpenkler@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/usb/class/usbtmc.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -1475,8 +1475,10 @@ static int usbtmc_probe(struct usb_inter
 	if (data->iin_ep_present) {
 		/* allocate int urb */
 		data->iin_urb = usb_alloc_urb(0, GFP_KERNEL);
-		if (!data->iin_urb)
+		if (!data->iin_urb) {
+			retcode = -ENOMEM;
 			goto error_register;
+		}
 
 		/* will reference data in int urb */
 		kref_get(&data->kref);
@@ -1484,8 +1486,10 @@ static int usbtmc_probe(struct usb_inter
 		/* allocate buffer for interrupt in */
 		data->iin_buffer = kmalloc(data->iin_wMaxPacketSize,
 					GFP_KERNEL);
-		if (!data->iin_buffer)
+		if (!data->iin_buffer) {
+			retcode = -ENOMEM;
 			goto error_register;
+		}
 
 		/* fill interrupt urb */
 		usb_fill_int_urb(data->iin_urb, data->usb_dev,


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

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