diff options
| author | Cameron Gutman <aicommander@gmail.com> | 2016-06-29 09:51:35 -0700 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2016-08-21 23:22:42 +0200 |
| commit | 0378ecf174b4e7f9d1a263bd07c38fbf2c627e6b (patch) | |
| tree | 4f6ba24ae90af2a818aa3af5ec985f4cea3f55b3 /drivers/input | |
| parent | 2ae02f03721136e1b8ceef84a3926fc006ff2c8b (diff) | |
| download | lwn-0378ecf174b4e7f9d1a263bd07c38fbf2c627e6b.tar.gz lwn-0378ecf174b4e7f9d1a263bd07c38fbf2c627e6b.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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'drivers/input')
| -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 856c1b03e22d..685e125d6366 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -843,6 +843,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)) |