Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: Do not discard truncated input reports

+1 -1
+1 -1
drivers/hid/hid-core.c
··· 969 970 if (size < rsize) { 971 dbg("report %d is too short, (%d < %d)", report->id, size, rsize); 972 - return -1; 973 } 974 975 if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event)
··· 969 970 if (size < rsize) { 971 dbg("report %d is too short, (%d < %d)", report->id, size, rsize); 972 + memset(data + size, 0, rsize - size); 973 } 974 975 if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event)