summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-03-16 19:34:02 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-03-16 21:56:45 +0100
commit59cf8bed44a79ec42303151dd014fdb6434254bb (patch)
tree7dc877eb9272ff0aade62aa70e9a56f9a6393644 /drivers/input/joystick
parentInput: elan_i2c - add ASUS EeeBook X205TA special touchpad fw (diff)
downloadlinux-59cf8bed44a79ec42303151dd014fdb6434254bb.tar.xz
linux-59cf8bed44a79ec42303151dd014fdb6434254bb.zip
Input: iforce - validate number of endpoints before using them
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. Signed-off-by: Johan Hovold <johan@kernel.org> Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/joystick')
-rw-r--r--drivers/input/joystick/iforce/iforce-usb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index d96aa27dfcdc..db64adfbe1af 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -141,6 +141,9 @@ static int iforce_usb_probe(struct usb_interface *intf,
interface = intf->cur_altsetting;
+ if (interface->desc.bNumEndpoints < 2)
+ return -ENODEV;
+
epirq = &interface->endpoint[0].desc;
epout = &interface->endpoint[1].desc;