summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-03-16 18:35:12 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-30 07:41:23 (GMT)
commit83d920e464fafb738be14096cd1cf3c983d8bab4 (patch)
treeb07437c7ee3f03933b5c0590307d0d6e6f5111bb
parent9f6a8dca9874ca923dbb253a96e9f4a537643b9d (diff)
downloadlinux-83d920e464fafb738be14096cd1cf3c983d8bab4.tar.xz
Input: cm109 - validate number of endpoints before using them
commit ac2ee9ba953afe88f7a673e1c0c839227b1d7891 upstream. Make sure to check the number of endpoints to avoid dereferencing a NULL-pointer should a malicious device lack endpoints. Fixes: c04148f915e5 ("Input: add driver for USB VoIP phones with CM109...") 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/misc/cm109.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index 9cc6d05..23c191a 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -700,6 +700,10 @@ static int cm109_usb_probe(struct usb_interface *intf,
int error = -ENOMEM;
interface = intf->cur_altsetting;
+
+ if (interface->desc.bNumEndpoints < 1)
+ return -ENODEV;
+
endpoint = &interface->endpoint[0].desc;
if (!usb_endpoint_is_int_in(endpoint))