| From caca925fca4fb30c67be88cacbe908eec6721e43 Mon Sep 17 00:00:00 2001 |
| From: Cameron Gutman <aicommander@gmail.com> |
| Date: Wed, 29 Jun 2016 09:51:35 -0700 |
| Subject: Input: xpad - validate USB endpoint count during probe |
| |
| From: Cameron Gutman <aicommander@gmail.com> |
| |
| 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> |
| |
| --- |
| drivers/input/joystick/xpad.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/input/joystick/xpad.c |
| +++ b/drivers/input/joystick/xpad.c |
| @@ -1200,6 +1200,9 @@ static int xpad_probe(struct usb_interfa |
| 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)) |
