HID: core: Mitigate potential OOB by removing bogus memset()

The memset() in hid_report_raw_event() has the good intention of
clearing out bogus data by zeroing the area from the end of the incoming
data string to the assumed end of the buffer.  However, as we have
previously seen, doing so can easily result in OOB reads and writes in
the subsequent thread of execution.

The current suggestion from one of the HID maintainers is to remove the
memset() and simply return if the incoming event buffer size is not
large enough to fill the associated report.

Suggested-by Benjamin Tissoires <bentiss@kernel.org>

Signed-off-by: Lee Jones <lee@kernel.org>
[bentiss: changed the return value]
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index a5b3a8ca2fcbc868470dd50ec14e4c7829dd863b..f5587b786f87513f0a9388d70cd30c744a946994 100644 (file)
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2057,9 +2057,10 @@ int hid_report_raw_event(struct hid_device *hid, enum hid_report_type type, u8 *
                rsize = max_buffer_size;
 
        if (csize < rsize) {
-               dbg_hid("report %d is too short, (%d < %d)\n", report->id,
-                               csize, rsize);
-               memset(cdata + csize, 0, rsize - csize);
+               hid_warn_ratelimited(hid, "Event data for report %d was too short (%d vs %d)\n",
+                                    report->id, rsize, csize);
+               ret = -EINVAL;
+               goto out;
        }
 
        if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event)