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>
This commit is contained in:
Jiri Kosina 2013-09-04 12:06:25 +02:00
commit 47ab1a2de4
2 changed files with 10 additions and 4 deletions

View file

@ -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