diff options
author | Jiri Kosina <jkosina@suse.cz> | 2014-08-27 09:12:24 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-08-27 09:14:39 +0200 |
commit | c54def7bd64d7c0b6993336abcffb8444795bf38 (patch) | |
tree | ed1c5fdea443dfd8c85138dfa9d534028efe30c0 /drivers/hid | |
parent | 5abfe85c1d4694d5d4bbd13ecc166262b937adf0 (diff) | |
download | linux-c54def7bd64d7c0b6993336abcffb8444795bf38.tar.gz linux-c54def7bd64d7c0b6993336abcffb8444795bf38.tar.bz2 linux-c54def7bd64d7c0b6993336abcffb8444795bf38.zip |
HID: magicmouse: sanity check report size in raw_event() callback
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>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-magicmouse.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index ecc2cbf300cc..29a74c1efcb8 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -290,6 +290,11 @@ static int magicmouse_raw_event(struct hid_device *hdev, if (size < 4 || ((size - 4) % 9) != 0) return 0; 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; for (ii = 0; ii < npoints; ii++) 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) return 0; 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; for (ii = 0; ii < npoints; ii++) magicmouse_emit_touch(msc, ii, data + ii * 8 + 6); |