diff options
| author |   Roel Kluin <roel.kluin@gmail.com> | 2009-08-08 02:17:32 +0200 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2009-08-08 02:17:32 +0200 |
| commit | 44cb2db10d05fc263c9fa44347d350d4f7f5890c (patch) | |
| tree | 74fada50b6f2950279dbe8b771e3fc33d52f177c /drivers/hid/usbhid | |
| parent | Merge branch 'perf-counters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf (diff) | |
| download | linux-dev-44cb2db10d05fc263c9fa44347d350d4f7f5890c.tar.xz linux-dev-44cb2db10d05fc263c9fa44347d350d4f7f5890c.zip | |
HID: fix overrun in quirks initialization
Check whether index is within bounds before testing the element.
declared in drivers/hid/usbhid/hid-core.c:62:
static char *quirks_param[MAX_USBHID_BOOT_QUIRKS] = ...
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid')
| -rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index d8f7423f363e..0d9045aa2c4b 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -201,7 +201,7 @@ int usbhid_quirks_init(char **quirks_param) u32 quirks; int n = 0, m; - for (; quirks_param[n] && n < MAX_USBHID_BOOT_QUIRKS; n++) { + for (; n < MAX_USBHID_BOOT_QUIRKS && quirks_param[n]; n++) { m = sscanf(quirks_param[n], "0x%hx:0x%hx:0x%x", &idVendor, &idProduct, &quirks); |