]> err.no Git - linux-2.6/commitdiff
HID: Do not discard truncated input reports
authorAdam Kropelin <akropel1@rochester.rr.com>
Thu, 5 Apr 2007 14:06:30 +0000 (16:06 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 5 Apr 2007 14:06:30 +0000 (16:06 +0200)
Truncated reports should not be discarded since it prevents buggy
devices from communicating with userspace.

Prior to the regession introduced in 2.6.20, a shorter-than-expected
report in hid_input_report() was passed thru after having the missing
bytes cleared. This behavior was established over a few patches in the
2.6.early-teens days, including commit
cd6104572bca9e4afe0dcdb8ecd65ef90b01297b.

This patch restores the previous behavior and fixes the regression.

Signed-off-by: Adam Kropelin <akropel1@rochester.rr.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-core.c

index 67f3347afcf35620d941a893183f0883f0392f00..1cca32f46947e0675ea7b77ea28b043393ef3f75 100644 (file)
@@ -969,7 +969,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
 
        if (size < rsize) {
                dbg("report %d is too short, (%d < %d)", report->id, size, rsize);
-               return -1;
+               memset(data + size, 0, rsize - size);
        }
 
        if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event)