diff options
author | Kees Cook <keescook@chromium.org> | 2013-08-28 16:29:55 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-08-29 05:01:25 -0400 |
commit | 43622021d2e2b82ea03d883926605bdd0525e1d1 (patch) | |
tree | eb347fb9b63e544151787d58f8940bdd957961a0 /include/linux/hid.h | |
parent | 58c59bc997d86593f0bea41845885917cf304d22 (diff) |
HID: validate HID report id size
The "Report ID" field of a HID report is used to build indexes of
reports. The kernel's index of these is limited to 256 entries, so any
malicious device that sets a Report ID greater than 255 will trigger
memory corruption on the host:
[ 1347.156239] BUG: unable to handle kernel paging request at ffff88094958a878
[ 1347.156261] IP: [<ffffffff813e4da0>] hid_register_report+0x2a/0x8b
CVE-2013-2888
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@kernel.org
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 0c48991b0402..ff545cc33c3a 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
@@ -393,10 +393,12 @@ struct hid_report { | |||
393 | struct hid_device *device; /* associated device */ | 393 | struct hid_device *device; /* associated device */ |
394 | }; | 394 | }; |
395 | 395 | ||
396 | #define HID_MAX_IDS 256 | ||
397 | |||
396 | struct hid_report_enum { | 398 | struct hid_report_enum { |
397 | unsigned numbered; | 399 | unsigned numbered; |
398 | struct list_head report_list; | 400 | struct list_head report_list; |
399 | struct hid_report *report_id_hash[256]; | 401 | struct hid_report *report_id_hash[HID_MAX_IDS]; |
400 | }; | 402 | }; |
401 | 403 | ||
402 | #define HID_REPORT_TYPES 3 | 404 | #define HID_REPORT_TYPES 3 |