]> git.hungrycats.org Git - linux/commitdiff
HID: logitech-dj: validate unnumbered keyboard reports
authorJiale Yao <yaojiale02@163.com>
Thu, 24 Sep 2026 14:44:08 +0000 (22:44 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:10:50 +0000 (12:10 -0500)
commit c2deafcb4c8227771f768d77ed3c0a489250e9b2 upstream.

The HID core invokes raw_event callbacks before validating the report
length.  For an unnumbered keyboard report, logi_dj_raw_event() uses the
second byte as temporary storage while prepending a report ID.  A one-byte
report therefore makes both the initial write and the later restoration
access data beyond the received report.

Reject unnumbered keyboard reports that do not provide the temporary byte.

Commit 47669bec44fe ("HID: asus: refactor the two workqueues and init
sequence") added the same kind of raw_event length validation to hid-asus.

Fixes: 74808f9115ce ("HID: logitech-dj: add support for non unifying receivers")
Cc: stable@vger.kernel.org
Signed-off-by: Jiale Yao <yaojiale02@163.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hid/hid-logitech-dj.c

index 390d106d5dc131d1455a90cafe2da647f813d629..6e8db01d27ec0ed1d5c3bfc592b7de4ded894832 100644 (file)
@@ -1790,6 +1790,9 @@ static int logi_dj_raw_event(struct hid_device *hdev,
        if (!hdev->report_enum[HID_INPUT_REPORT].numbered) {
 
                if (djrcv_dev->unnumbered_application == HID_GD_KEYBOARD) {
+                       if (size < 2)
+                               return false;
+
                        /*
                         * For the keyboard, we can reuse the same report by
                         * using the second byte which is constant in the USB