Skip to content

Commit a2f7271

Browse files
committed
HID: hid-cypress: validate length of report
commit 1ebb71143758f45dc0fa76e2f48429e13b16d110 upstream. Make sure we have enough of a report structure to validate before looking at it. Reported-by: Benoit Camredon <benoit.camredon@airbus.com> Tested-by: Benoit Camredon <benoit.camredon@airbus.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
1 parent 70e05a9 commit a2f7271

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/hid/hid-cypress.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ static __u8 *cp_report_fixup(struct hid_device *hdev, __u8 *rdesc,
3939
if (!(quirks & CP_RDESC_SWAPPED_MIN_MAX))
4040
return rdesc;
4141

42+
if (*rsize < 4)
43+
return rdesc;
44+
4245
for (i = 0; i < *rsize - 4; i++)
4346
if (rdesc[i] == 0x29 && rdesc[i + 2] == 0x19) {
4447
rdesc[i] = 0x19;

0 commit comments

Comments
 (0)