From: Ben Collins Date: Tue, 31 Jan 2006 06:31:13 +0000 (-0500) Subject: Input: hiddev - fix off-by-one for num_values in uref_multi requests X-Git-Tag: v2.6.16-rc2~171^2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dea93477c3377cf4199fd37cc3fb11071987ae4;p=linux-2.6 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 Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c index 4dff847355..3f7274906c 100644 --- a/drivers/usb/input/hiddev.c +++ b/drivers/usb/input/hiddev.c @@ -632,7 +632,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd 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; }