From c6a5b5d2288390f9b46b80e25762045e83704fef Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Tue, 31 Jan 2006 01:31:13 -0500 Subject: [PATCH] --- yaml --- r: 19301 b: refs/heads/master c: 6dea93477c3377cf4199fd37cc3fb11071987ae4 h: refs/heads/master i: 19299: 3fe1f00912d46b22b7d2cf0e3a6d3ece1bf82f32 v: v3 --- [refs] | 2 +- trunk/drivers/usb/input/hiddev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4c960262f3f8..e270e6137795 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97d4ebfe7946bc9b89791c932a15c990a24aa94d +refs/heads/master: 6dea93477c3377cf4199fd37cc3fb11071987ae4 diff --git a/trunk/drivers/usb/input/hiddev.c b/trunk/drivers/usb/input/hiddev.c index 4dff8473553d..3f7274906c13 100644 --- a/trunk/drivers/usb/input/hiddev.c +++ b/trunk/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; }