diff options
author | Johan Hovold <johan@kernel.org> | 2017-03-16 14:43:09 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-30 03:41:23 -0400 |
commit | 425823646eaed17448ce23101204973d48f376fb (patch) | |
tree | bac2688b4421963c239c102bb77d6f86489f02b2 | |
parent | b1feb4e5aab4e29b9929c696d702d02a789bc8b1 (diff) |
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: 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>
-rw-r--r-- | drivers/input/touchscreen/sur40.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c index aefb6e11f88a..4c0eecae065c 100644 --- a/drivers/input/touchscreen/sur40.c +++ b/drivers/input/touchscreen/sur40.c | |||
@@ -527,6 +527,9 @@ static int sur40_probe(struct usb_interface *interface, | |||
527 | if (iface_desc->desc.bInterfaceClass != 0xFF) | 527 | if (iface_desc->desc.bInterfaceClass != 0xFF) |
528 | return -ENODEV; | 528 | return -ENODEV; |
529 | 529 | ||
530 | if (iface_desc->desc.bNumEndpoints < 5) | ||
531 | return -ENODEV; | ||
532 | |||
530 | /* Use endpoint #4 (0x86). */ | 533 | /* Use endpoint #4 (0x86). */ |
531 | endpoint = &iface_desc->endpoint[4].desc; | 534 | endpoint = &iface_desc->endpoint[4].desc; |
532 | if (endpoint->bEndpointAddress != TOUCH_ENDPOINT) | 535 | if (endpoint->bEndpointAddress != TOUCH_ENDPOINT) |