summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-03-16 11:35:12 -0700
committerSasha Levin <alexander.levin@verizon.com>2017-05-17 15:07:02 -0400
commit6585effe7d220f2fef5c07a3c499584cc05ee275 (patch)
tree84976d9b057b8a1d1f0233ddb1126ccb0814f7c4 /drivers/input
parent76d981017361e0937f2f2c83fe7b02b590e74bdd (diff)
Input: cm109 - validate number of endpoints before using them
[ Upstream commit ac2ee9ba953afe88f7a673e1c0c839227b1d7891 ] 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> Cc: stable@vger.kernel.org # 2.6.28 Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/input')
-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 9365535ba7f1..50a7faa504f7 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -675,6 +675,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))