github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

HID: usbhid: paper over wrong bNumDescriptor field

Browse Source 
Some faulty devices (ZWO EFWmini) have a wrong optional HID class
descriptor count compared to the provided length.

Given that we plainly ignore those optional descriptor, we can attempt
to fix the provided number so we do not lock out those devices.

Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
This commit is contained in:
Benjamin Tissoires 2025-12-15 12:57:21 +01:00
parent fde4ce068d
commit f28beb69c5
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/hid/usbhid/hid-core.c
View File

@ -985,6 +985,7 @@ static int usbhid_parse(struct hid_device *hid)
struct usb_device *dev = interface_to_usbdev (intf);
struct hid_descriptor *hdesc;
struct hid_class_descriptor *hcdesc;
__u8 fixed_opt_descriptors_size;
u32 quirks = 0;
unsigned int rsize = 0;
char *rdesc;
@ -1015,7 +1016,21 @@ static int usbhid_parse(struct hid_device *hid)
(hdesc->bNumDescriptors - 1) * sizeof(*hcdesc)) {
dbg_hid("hid descriptor invalid, bLen=%hhu bNum=%hhu\n",
hdesc->bLength, hdesc->bNumDescriptors);
return -EINVAL;
/*
* Some devices may expose a wrong number of descriptors compared
* to the provided length.
* However, we ignore the optional hid class descriptors entirely
* so we can safely recompute the proper field.
*/
if (hdesc->bLength >= sizeof(*hdesc)) {
fixed_opt_descriptors_size = hdesc->bLength - sizeof(*hdesc);
hid_warn(intf, "fixing wrong optional hid class descriptors count\n");
hdesc->bNumDescriptors = fixed_opt_descriptors_size / sizeof(*hcdesc) + 1;
} else {
return -EINVAL;
}
}
hid->version = le16_to_cpu(hdesc->bcdHID);