diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2013-09-04 12:06:25 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-09-04 12:06:58 +0200 |
| commit | 47ab1a2de42031021965b81cbab4f3b4c5696d07 (patch) | |
| tree | 292df51948f1afa0277108df3001462ae6a5e3b1 /include/linux/hid.h | |
| parent | HID: check for NULL field when setting values (diff) | |
| parent | HID: validate HID report id size (diff) | |
| download | linux-dev-47ab1a2de42031021965b81cbab4f3b4c5696d07.tar.xz linux-dev-47ab1a2de42031021965b81cbab4f3b4c5696d07.zip | |
Merge branch 'for-3.11/CVE-2013-2888' into for-3.12/upstream
This one didn't make it for 3.11 due to being applied too close
to release, queue it for 3.12 merge window.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index acccdf4eb485..d50137691a78 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -393,10 +393,12 @@ struct hid_report { struct hid_device *device; /* associated device */ }; +#define HID_MAX_IDS 256 + struct hid_report_enum { unsigned numbered; struct list_head report_list; - struct hid_report *report_id_hash[256]; + struct hid_report *report_id_hash[HID_MAX_IDS]; }; #define HID_REPORT_TYPES 3 |