AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

HID: magicmouse: sanity check report size in raw_event() callback

Browse Source 
The report passed to us from transport driver could potentially be
arbitrarily large, therefore we better sanity-check it so that
magicmouse_emit_touch() gets only valid values of raw_id.

Cc: stable@vger.kernel.org
Reported-by: Steven Vittitoe <scvitti@google.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Jiri Kosina 2014-08-27 09:12:24 +02:00
parent 5abfe85c1d
commit c54def7bd6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/hid/hid-magicmouse.c
View File

@ -290,6 +290,11 @@ static int magicmouse_raw_event(struct hid_device *hdev,
if (size < 4 || ((size - 4) % 9) != 0) if (size < 4 || ((size - 4) % 9) != 0)
return 0; return 0;
npoints = (size - 4) / 9; npoints = (size - 4) / 9;
if (npoints > 15) {
hid_warn(hdev, "invalid size value (%d) for TRACKPAD_REPORT_ID\n",
size);
return 0;
}
msc->ntouches = 0; msc->ntouches = 0;
for (ii = 0; ii < npoints; ii++) for (ii = 0; ii < npoints; ii++)
magicmouse_emit_touch(msc, ii, data + ii * 9 + 4); magicmouse_emit_touch(msc, ii, data + ii * 9 + 4);
@ -307,6 +312,11 @@ static int magicmouse_raw_event(struct hid_device *hdev,
if (size < 6 || ((size - 6) % 8) != 0) if (size < 6 || ((size - 6) % 8) != 0)
return 0; return 0;
npoints = (size - 6) / 8; npoints = (size - 6) / 8;
if (npoints > 15) {
hid_warn(hdev, "invalid size value (%d) for MOUSE_REPORT_ID\n",
size);
return 0;
}
msc->ntouches = 0; msc->ntouches = 0;
for (ii = 0; ii < npoints; ii++) for (ii = 0; ii < npoints; ii++)
magicmouse_emit_touch(msc, ii, data + ii * 8 + 6); magicmouse_emit_touch(msc, ii, data + ii * 8 + 6);