Messages in this thread Patch in this message | | | From | Zefan Li <> | Subject | [PATCH 3.4 30/45] HID: picolcd: sanity check report size in raw_event() callback | Date | Tue, 23 Sep 2014 10:31:32 +0800 |
| |
From: Jiri Kosina <jkosina@suse.cz>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
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> [lizf: Backported to 3.4: adjust filename] Signed-off-by: Zefan Li <lizefan@huawei.com> --- drivers/hid/hid-picolcd.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c index 95f9047..4e37b1f 100644 --- a/drivers/hid/hid-picolcd.c +++ b/drivers/hid/hid-picolcd.c @@ -2370,6 +2370,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); -- 1.7.9.5
| |