Input: sur40 - validate number of endpoints before using them

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: bdb5c57f20 ("Input: add sur40 driver for Samsung SUR40... ")
Signed-off-by: Johan Hovold <johan@kernel.org>
Cc: stable@vger.kernel.org	# 3.13
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Johan Hovold 2017-03-16 11:43:09 -07:00 committed by Dmitry Torokhov
parent cb1b494663
commit 92461f5d72

View File

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