Patch "USB: wusbcore: fix NULL-deref at probe" has been added to the 4.9-stable tree

Patch "USB: wusbcore: fix NULL-deref at probe" 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: wusbcore: fix NULL-deref at probe

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-wusbcore-fix-null-deref-at-probe.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 03ace948a4eb89d1cf51c06afdfc41ebca5fdb27 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Mon, 13 Mar 2017 13:47:51 +0100
Subject: USB: wusbcore: fix NULL-deref at probe

From: Johan Hovold <johan@kernel.org>

commit 03ace948a4eb89d1cf51c06afdfc41ebca5fdb27 upstream.

Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer or accessing memory beyond the endpoint array should a
malicious device lack the expected endpoints.

This specifically fixes the NULL-pointer dereference when probing HWA HC
devices.

Fixes: df3654236e31 ("wusb: add the Wire Adapter (WA) core")
Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Cc: David Vrabel <david.vrabel@csr.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/usb/wusbcore/wa-hc.c |    3 +++
 1 file changed, 3 insertions(+)

--- a/drivers/usb/wusbcore/wa-hc.c
+++ b/drivers/usb/wusbcore/wa-hc.c
@@ -39,6 +39,9 @@ int wa_create(struct wahc *wa, struct us
 	int result;
 	struct device *dev = &iface->dev;
 
+	if (iface->cur_altsetting->desc.bNumEndpoints < 3)
+		return -ENODEV;
+
 	result = wa_rpipes_create(wa);
 	if (result < 0)
 		goto error_rpipes_create;


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