Skip to contentSkip to conversation

Input: xpad - validate USB endpoint count during probe

PATCH Applied Cameron Gutman 2 participants 2 messages Jun 29, 2016

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Cameron Gutman

author
#0 lore raw

PATCH 1/1 Input: xpad - validate USB endpoint count during probe

This prevents a malicious USB device from causing an oops.

Signed-off-by Cameron Gutman <[email protected]>
Cc [email protected]
---
 drivers/input/joystick/xpad.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/input/joystick/xpad.c +3 -0
index 3438e98..a529a45 100644
@@ -1431,6 +1431,9 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
 	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))
Signature · 1 line
2.7.4
maintainer Applied
#1 lore raw
Quoted 5 lines · Cameron Gutman

This prevents a malicious USB device from causing an oops.

Signed-off-by Cameron Gutman <[email protected]>
Cc [email protected]

---

Applied, thank you.

Quoted 19 lines
 drivers/input/joystick/xpad.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/input/joystick/xpad.c +3 -0
index 3438e98..a529a45 100644
@@ -1431,6 +1431,9 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
 	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))
Signature · 1 line
2.7.4
Signature · 1 line
Dmitry