summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2015-06-21 09:20:25 +0300
committerJiri Kosina <jkosina@suse.com>2015-07-08 13:40:23 +0300
commit6debce6f4e787a8eb4cec94e7afa85fb4f40db27 (patch)
treeb590743fb1eb84392c6a434e4593ebd70f5d72ed /drivers/hid
parent9633920e5ef65f81d30f2acd642d6d1c25cf7bc7 (diff)
downloadlinux-6debce6f4e787a8eb4cec94e7afa85fb4f40db27.tar.xz
HID: cp2112: fix to force single data-report reply
Current implementation of cp2112_raw_event() only accepts one data report at a time. If last received data report is not fully handled yet, a new incoming data report will overwrite it. In such case we don't guaranteed to propagate the correct incoming data. The trivial fix implemented here forces a single report at a time by requesting in cp2112_read() no more than 61 byte of data, which is the payload size of a single data report. Cc: stable@vger.kernel.org Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Tested-by: Ellen Wang <ellen@cumulusnetworks.com> Signed-off-by: Jiri Kosina <jkosina@suse.com>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-cp2112.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c
index 3318de690e00..a2dbbbe0d8d7 100644
--- a/drivers/hid/hid-cp2112.c
+++ b/drivers/hid/hid-cp2112.c
@@ -356,6 +356,8 @@ static int cp2112_read(struct cp2112_device *dev, u8 *data, size_t size)
struct cp2112_force_read_report report;
int ret;
+ if (size > sizeof(dev->read_data))
+ size = sizeof(dev->read_data);
report.report = CP2112_DATA_READ_FORCE_SEND;
report.length = cpu_to_be16(size);