diff options
| author | Cameron Gutman <aicommander@gmail.com> | 2016-06-29 09:51:35 -0700 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-07 21:44:38 -0400 |
| commit | 3837836cb5e729b7ee2b80957f82141d6ee30436 (patch) | |
| tree | 5ef03a835dbbbc22bbd84a31c9b396133f537b44 /drivers/input/joystick | |
| parent | 06c742fbf4877d958cdf9d225480a45863461a06 (diff) | |
Input: xpad - validate USB endpoint count during probe
[ Upstream commit caca925fca4fb30c67be88cacbe908eec6721e43 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/xpad.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index fc55f0d15b70..7b41d543a41f 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -1006,6 +1006,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)) |