Fix off-by-one for num_values in uref_multi requests
PATCH 1/1 Fix off-by-one for num_values in uref_multi requests
Found this when working with a HAPP UGCI device. It has a usage with 7 indexes. I could read them all one at a time, but using a multiref it would only allow me to read the first 6. The patch below fixed it.
Signed-off-by Ben Collins <[email protected]>
drivers/usb/input/hiddev.c +1 -1
@@ -632,7 +632,7 @@ static int hiddev_ioctl(struct inode *inelse if ((cmd ==HIDIOCGUSAGES || cmd ==HIDIOCSUSAGES ) && (uref_multi->num_values >HID_MAX_MULTI_USAGES || - uref->usage_index + uref_multi->num_values >= field->report_count)) + uref->usage_index + uref_multi->num_values > field->report_count)) goto inval; }
Signature · 2 lines
Ben Collins Kernel Developer - Ubuntu Linux
Dmitry Torokhov
AppliedQuoted 6 lines · Ben Collins
Found this when working with a HAPP UGCI device. It has a usage with 7 indexes. I could read them all one at a time, but using a multiref it would only allow me to read the first 6. The patch below fixed it.
Signed-off-by Ben Collins <[email protected]>
I applied this to the input tree, thanks!
Quoted 12 lines
drivers/usb/input/hiddev.c +1
-1@@ -632,7 +632,7 @@ static int hiddev_ioctl(struct inode *inelse if ((cmd ==HIDIOCGUSAGES || cmd ==HIDIOCSUSAGES ) && (uref_multi->num_values >HID_MAX_MULTI_USAGES || - uref->usage_index + uref_multi->num_values >= field->report_count)) + uref->usage_index + uref_multi->num_values > field->report_count)) goto inval; }
Signature · 1 line
Dmitry