]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
HID: cp2112: fix to force single data-report reply
authorAntonio Borneo <borneo.antonio@gmail.com>
Sun, 21 Jun 2015 06:20:25 +0000 (14:20 +0800)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 11 Aug 2015 08:57:30 +0000 (09:57 +0100)
commit 6debce6f4e787a8eb4cec94e7afa85fb4f40db27 upstream.

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.

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Tested-by: Ellen Wang <ellen@cumulusnetworks.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/hid/hid-cp2112.c

index 56be85a9a77c358d84a3aad0007f127d4992fe6d..ffe69be882de4762f46a62797e5172b966a9a47c 100644 (file)
@@ -352,6 +352,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);