Messages in this thread Patch in this message | | | From | Johan Hovold <> | Subject | [PATCH 7/7] Input: sur40 - fix NULL-deref at probe | Date | Mon, 13 Mar 2017 13:35:39 +0100 |
| |
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 (aka MS Surface 2.0/Pixelsense)") Cc: stable <stable@vger.kernel.org> # 3.13 Cc: Florian Echtler <floe@butterbrot.org> Cc: David Herrmann <dh.herrmann@gmail.com> Cc: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/input/touchscreen/sur40.c | 3 +++ 1 file changed, 3 insertions(+)
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, 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
| |