2006-02-01 05:09:35

by Dmitry Torokhov

[permalink] [raw]
Subject: [GIT PATCH 18/18] hiddev: fix off-by-one for num_values in uref_multi requests

From: Ben Collins <[email protected]>

Input: hiddev - 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]>
Signed-off-by: Dmitry Torokhov <[email protected]>
---

drivers/usb/input/hiddev.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)

Index: work/drivers/usb/input/hiddev.c
===================================================================
--- work.orig/drivers/usb/input/hiddev.c
+++ work/drivers/usb/input/hiddev.c
@@ -631,7 +631,7 @@ static int hiddev_ioctl(struct inode *in

else 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;
}