Commit 42582364 authored Mar 16, 2017 by Johan Hovold Committed by Greg Kroah-Hartman Mar 30, 2017

Input: sur40 - validate number of endpoints before using them



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: bdb5c57f ("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>

parent b1feb4e5

drivers/input/touchscreen/sur40.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -527,6 +527,9 @@ static int sur40_probe(struct usb_interface *interface,
		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)