summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorCameron Gutman <aicommander@gmail.com>2016-06-29 09:51:35 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-06-29 10:07:47 -0700
commitcaca925fca4fb30c67be88cacbe908eec6721e43 (patch)
treef3a0cee72b30fdb96e316f39b42516481eb399b6 /drivers/input
parent9a9b6aa6a8759c83024627d681eff982d6ee03b7 (diff)
downloadlinux-caca925fca4fb30c67be88cacbe908eec6721e43.tar.bz2
Input: xpad - validate USB endpoint count during probe
This prevents a malicious USB device from causing an oops. Signed-off-by: Cameron Gutman <aicommander@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/joystick/xpad.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 3438e98c145a..a529a4535457 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -1431,6 +1431,9 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
int ep_irq_in_idx;
int i, error;
+ if (intf->cur_altsetting->desc.bNumEndpoints != 2)
+ return -ENODEV;
+
for (i = 0; xpad_device[i].idVendor; i++) {
if ((le16_to_cpu(udev->descriptor.idVendor) == xpad_device[i].idVendor) &&
(le16_to_cpu(udev->descriptor.idProduct) == xpad_device[i].idProduct))