Commit ac8f836e authored Sep 12, 2017 by Cameron Gutman Committed by Greg Kroah-Hartman Dec 01, 2018

Input: xpad - validate USB endpoint type during probe



[ Upstream commit 122d6a347329818419b032c5a1776e6b3866d9b9 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 7d6d5fc8

drivers/input/joystick/xpad.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -1764,11 +1764,13 @@ 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_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) {
		error = -ENODEV;