diff options
author | Jiri Kosina <jkosina@suse.cz> | 2014-08-27 09:13:15 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-09-13 23:41:47 +0100 |
commit | b23ea023ee26e97ba6ffdc3c9d54448a77f1b894 (patch) | |
tree | 7196e7e6c1d11da2a5d615221d936644ee97a3c0 | |
parent | e3ead9249d874dbb7a8e7c3e6e54de35a481986c (diff) | |
download | linux-stable-b23ea023ee26e97ba6ffdc3c9d54448a77f1b894.tar.gz linux-stable-b23ea023ee26e97ba6ffdc3c9d54448a77f1b894.tar.bz2 linux-stable-b23ea023ee26e97ba6ffdc3c9d54448a77f1b894.zip |
HID: picolcd: sanity check report size in raw_event() callback
commit 844817e47eef14141cf59b8d5ac08dd11c0a9189 upstream.
The report passed to us from transport driver could potentially be
arbitrarily large, therefore we better sanity-check it so that raw_data
that we hold in picolcd_pending structure are always kept within proper
bounds.
Reported-by: Steven Vittitoe <scvitti@google.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r-- | drivers/hid/hid-picolcd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c index 1daeacabc832..c95213182760 100644 --- a/drivers/hid/hid-picolcd.c +++ b/drivers/hid/hid-picolcd.c @@ -2382,6 +2382,12 @@ static int picolcd_raw_event(struct hid_device *hdev, if (!data) return 1; + if (size > 64) { + hid_warn(hdev, "invalid size value (%d) for picolcd raw event\n", + size); + return 0; + } + if (report->id == REPORT_KEY_STATE) { if (data->input_keys) ret = picolcd_raw_keypad(data, report, raw_data+1, size-1); |