| From 421fc56acbbe157b68b5d6785eb8977697f11998 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Thu, 16 Mar 2017 11:43:09 -0700 |
| Subject: [PATCH] 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> |
| Cc: stable@vger.kernel.org # 3.13 |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c |
| index 4ea475775d58..2aabe732952a 100644 |
| --- a/drivers/input/touchscreen/sur40.c |
| +++ b/drivers/input/touchscreen/sur40.c |
| @@ -506,6 +506,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) |
| -- |
| 2.12.0 |
| |