diff options
author | Armando Visconti <armando.visconti@st.com> | 2011-05-19 15:41:22 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-05-20 04:25:23 -0400 |
commit | 966922f26c7fb5eddbe3c506b66bb5659f57b76f (patch) | |
tree | 5b609b162a93583520bbf662c18c8cfd2acf499f /drivers/hid | |
parent | fdc6807fcd09416c5537f479e1dcd624118e234c (diff) |
HID: fix a crash in hid_report_raw_event() function.
I'm using a Data Modul EasyTouch USB multitouch controller,
which is issuing a hid report with a size equals to 0. The rsize
value gets set to 536870912 and Linux is crashing in the memset
because the value is too big.
Signed-off-by: Armando Visconti <armando.visconti@st.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 852989fc5757..84df80e3efc1 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1045,6 +1045,9 @@ void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, | |||
1045 | 1045 | ||
1046 | rsize = ((report->size - 1) >> 3) + 1; | 1046 | rsize = ((report->size - 1) >> 3) + 1; |
1047 | 1047 | ||
1048 | if (rsize > HID_MAX_BUFFER_SIZE) | ||
1049 | rsize = HID_MAX_BUFFER_SIZE; | ||
1050 | |||
1048 | if (csize < rsize) { | 1051 | if (csize < rsize) { |
1049 | dbg_hid("report %d is too short, (%d < %d)\n", report->id, | 1052 | dbg_hid("report %d is too short, (%d < %d)\n", report->id, |
1050 | csize, rsize); | 1053 | csize, rsize); |