Patch "Input: sur40 - validate number of endpoints before using them" 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

    Input: sur40 - validate number of endpoints before using them

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:
     input-sur40-validate-number-of-endpoints-before-using-them.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 92461f5d723037530c1f36cce93640770037812c Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Thu, 16 Mar 2017 11:43:09 -0700
Subject: Input: sur40 - validate number of endpoints before using them

From: Johan Hovold <johan@kernel.org>

commit 92461f5d723037530c1f36cce93640770037812c upstream.

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

Fixes: bdb5c57f209c ("Input: add sur40 driver for Samsung SUR40... ")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/input/touchscreen/sur40.c |    3 +++
 1 file changed, 3 insertions(+)

--- a/drivers/input/touchscreen/sur40.c
+++ b/drivers/input/touchscreen/sur40.c
@@ -527,6 +527,9 @@ static int sur40_probe(struct usb_interf
 	if (iface_desc->desc.bInterfaceClass != 0xFF)
 		return -ENODEV;
 
+	if (iface_desc->desc.bNumEndpoints < 5)
+		return -ENODEV;
+
 	/* Use endpoint #4 (0x86). */
 	endpoint = &iface_desc->endpoint[4].desc;
 	if (endpoint->bEndpointAddress != TOUCH_ENDPOINT)


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