diff options
| author | Cameron Gutman <aicommander@gmail.com> | 2016-06-29 09:51:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-10 10:21:03 +0200 |
| commit | 92abf1880ae656872a4a30b41b909d1baacdebb3 (patch) | |
| tree | 0e8377fba6a104d51e119be374c74132bd386703 | |
| parent | e01e999a12214918ddf626bbd7fb97dad6471aaf (diff) | |
| download | lwn-92abf1880ae656872a4a30b41b909d1baacdebb3.tar.gz lwn-92abf1880ae656872a4a30b41b909d1baacdebb3.zip | |
Input: xpad - validate USB endpoint count during probe
commit caca925fca4fb30c67be88cacbe908eec6721e43 upstream.
This prevents a malicious USB device from causing an oops.
Signed-off-by: Cameron Gutman <aicommander@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 517829f6a58b..4b67f70feab9 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -844,6 +844,9 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id struct usb_endpoint_descriptor *ep_irq_in; 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)) |