Skip to contentSkip to conversation

Patch "Input: xpad - validate USB endpoint count during probe" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message Aug 3, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

Input: xpad - validate USB endpoint count during probe

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
input-xpad-validate-usb-endpoint-count-during-probe.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From caca925fca4fb30c67be88cacbe908eec6721e43 Mon Sep 17 00:00:00 2001

From: Cameron Gutman <[email protected]>
Date: Wed, 29 Jun 2016 09:51:35 -0700
Subject: Input: xpad - validate USB endpoint count during probe

From: Cameron Gutman <[email protected]>

commit caca925fca4fb30c67be88cacbe908eec6721e43 upstream.

This prevents a malicious USB device from causing an oops.

---
 drivers/input/joystick/xpad.c |    3 +++
 1 file changed, 3 insertions(+)
drivers/input/joystick/xpad.c +3 -0
@@ -1421,6 +1421,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))

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/input-xpad-validate-usb-endpoint-count-during-probe.patch queue-4.6/input-xpad-fix-oops-when-attaching-an-unknown-xbox-one-gamepad.patch