Input: xpad - validate USB endpoint type during probe
authorCameron Gutman <aicommander@gmail.com>
Tue, 12 Sep 2017 18:27:44 +0000 (11:27 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 12 Sep 2017 18:45:59 +0000 (11:45 -0700)
We should only see devices with interrupt endpoints. Ignore any other
endpoints that we find, so we don't send try to send them interrupt URBs
and trigger a WARN down in the USB stack.

Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Cc: <stable@vger.kernel.org> # c01b5e7464f0 Input: xpad - don't depend on endpoint order
Signed-off-by: Cameron Gutman <aicommander@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/joystick/xpad.c

index 2578a7677040423c29203eeda8604f638bc8ed7f..f670dcb401c05bbf7b503451c2a73539d1f624e5 100644 (file)
@@ -1750,10 +1750,12 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
                struct usb_endpoint_descriptor *ep =
                                &intf->cur_altsetting->endpoint[i].desc;
 
-               if (usb_endpoint_dir_in(ep))
-                       ep_irq_in = ep;
-               else
-                       ep_irq_out = ep;
+               if (usb_endpoint_xfer_int(ep)) {
+                       if (usb_endpoint_dir_in(ep))
+                               ep_irq_in = ep;
+                       else
+                               ep_irq_out = ep;
+               }
        }
 
        if (!ep_irq_in || !ep_irq_out) {