aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-08-28 22:29:55 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 16:52:48 -0700
commit645c9dcabb2c234e6d4a546125830d04988a1f90 (patch)
tree8c05df876f1aacd5bf41cff68bdfb29318952a42 /include
parentc993386d8c99c60ffb1161076040f3ffb46c0794 (diff)
downloadkernel_samsung_smdk4412-645c9dcabb2c234e6d4a546125830d04988a1f90.zip
kernel_samsung_smdk4412-645c9dcabb2c234e6d4a546125830d04988a1f90.tar.gz
kernel_samsung_smdk4412-645c9dcabb2c234e6d4a546125830d04988a1f90.tar.bz2
HID: validate HID report id size
commit 43622021d2e2b82ea03d883926605bdd0525e1d1 upstream. 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> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/hid.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 42f7e2f..af30c64 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -414,10 +414,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