From: Cameron Gutman Date: Wed, 29 Jun 2016 16:51:35 +0000 (-0700) Subject: Input: xpad - validate USB endpoint count during probe X-Git-Tag: v3.16.39~319 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df03e1a1d939f5a8d1aaa2e414cc6a070f70fc19;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Dmitry Torokhov Signed-off-by: Ben Hutchings --- diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index e2c6559647111..a137a37381284 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -883,6 +883,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))