]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
HID: cougar: fix slab-out-of-bounds Read in cougar_report_fixup
authorCamila Alvarez <cam.alvarez.i@gmail.com>
Tue, 30 Jul 2024 23:42:43 +0000 (19:42 -0400)
committerJiri Kosina <jkosina@suse.com>
Thu, 1 Aug 2024 11:04:19 +0000 (13:04 +0200)
report_fixup for the Cougar 500k Gaming Keyboard was not verifying
that the report descriptor size was correct before accessing it

Reported-by: syzbot+24c0361074799d02c452@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=24c0361074799d02c452
Signed-off-by: Camila Alvarez <cam.alvarez.i@gmail.com>
Reviewed-by: Silvan Jegen <s.jegen@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
drivers/hid/hid-cougar.c

index cb8bd8aae15b511c3ff18388c2bdf5d95e3f4637..0fa785f52707ac22a7e39a22f5a9e643ec734465 100644 (file)
@@ -106,7 +106,7 @@ static void cougar_fix_g6_mapping(void)
 static __u8 *cougar_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                                 unsigned int *rsize)
 {
-       if (rdesc[2] == 0x09 && rdesc[3] == 0x02 &&
+       if (*rsize >= 117 && rdesc[2] == 0x09 && rdesc[3] == 0x02 &&
            (rdesc[115] | rdesc[116] << 8) >= HID_MAX_USAGES) {
                hid_info(hdev,
                        "usage count exceeds max: fixing up report descriptor\n");