From: Greg Kroah-Hartman Date: Wed, 5 Aug 2026 12:21:41 +0000 (+0200) Subject: 6.1-stable patches X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=e8a46cc9394b9aa727432d01ef0b32d9ec6afd74;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: hid-logitech-dj-fix-maxfield-check-in-dj-short-report-validation.patch --- diff --git a/queue-6.1/hid-logitech-dj-fix-maxfield-check-in-dj-short-report-validation.patch b/queue-6.1/hid-logitech-dj-fix-maxfield-check-in-dj-short-report-validation.patch new file mode 100644 index 0000000000..6c9e341d0d --- /dev/null +++ b/queue-6.1/hid-logitech-dj-fix-maxfield-check-in-dj-short-report-validation.patch @@ -0,0 +1,69 @@ +From 590cc4d782487632a52f37c2171bee1eeea29627 Mon Sep 17 00:00:00 2001 +From: HyeongJun An +Date: Thu, 18 Jun 2026 15:37:37 +0900 +Subject: HID: logitech-dj: Fix maxfield check in DJ short report validation + +From: HyeongJun An + +commit 590cc4d782487632a52f37c2171bee1eeea29627 upstream. + +Commit b6a57912854e ("HID: logitech-dj: Prevent REPORT_ID_DJ_SHORT +related user initiated OOB write") added validation for the DJ short +output report, but the error path dereferences rep->field[0] even when +rep->maxfield is zero. + +Commit 8b9a097eb2fc ("HID: logitech-dj: fix wrong detection of bad +DJ_SHORT output report") made the check conditional on rep being present, +but a crafted descriptor can still create report ID 0x20 with only padding +output items. hid-core registers the report, ignores the padding field, +and leaves rep->maxfield as zero. + +In that case the validation enters the rep->maxfield < 1 branch and then +dereferences rep->field[0]->report_count while printing the error message, +causing a NULL pointer dereference during probe. This is reproducible with +uhid by emulating a Logitech receiver with a padding-only DJ short output +report: + + BUG: KASAN: null-ptr-deref in logi_dj_probe+0xb1/0x754 [hid_logitech_dj] + Read of size 4 at addr 0000000000000028 by task kworker/4:1/129 + ... + Call Trace: + logi_dj_probe+0xb1/0x754 [hid_logitech_dj] + hid_device_probe+0x329/0x3f0 [hid] + really_probe+0x162/0x570 + __device_attach+0x137/0x2c0 + bus_probe_device+0x38/0xc0 + device_add+0xa56/0xce0 + hid_add_device+0x19c/0x280 [hid] + uhid_device_add_worker+0x2c/0xb0 [uhid] + +Reject the zero-field report before printing the field report_count. + +Fixes: b6a57912854e ("HID: logitech-dj: Prevent REPORT_ID_DJ_SHORT related user initiated OOB write") +Cc: stable@vger.kernel.org +Assisted-by: Claude:claude-opus-4-8 +Signed-off-by: HyeongJun An +Signed-off-by: Jiri Kosina +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hid/hid-logitech-dj.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/drivers/hid/hid-logitech-dj.c ++++ b/drivers/hid/hid-logitech-dj.c +@@ -1797,8 +1797,13 @@ static int logi_dj_probe(struct hid_devi + output_report_enum = &hdev->report_enum[HID_OUTPUT_REPORT]; + rep = output_report_enum->report_id_hash[REPORT_ID_DJ_SHORT]; + +- if (rep && (rep->maxfield < 1 || +- rep->field[0]->report_count != DJREPORT_SHORT_LENGTH - 1)) { ++ if (rep && rep->maxfield < 1) { ++ hid_err(hdev, "Expected size of DJ short report is %d, but got 0", ++ DJREPORT_SHORT_LENGTH - 1); ++ return -EINVAL; ++ } ++ ++ if (rep && rep->field[0]->report_count != DJREPORT_SHORT_LENGTH - 1) { + hid_err(hdev, "Expected size of DJ short report is %d, but got %d", + DJREPORT_SHORT_LENGTH - 1, rep->field[0]->report_count); + return -EINVAL; diff --git a/queue-6.1/series b/queue-6.1/series index 9a1a29f4b2..7f0ac88d82 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -472,3 +472,4 @@ drm-amdkfd-hold-event_mutex-while-checkpointing-criu-events.patch drm-vmwgfx-drop-dma_buf-reference-on-foreign-fd-prime-import.patch drm-vmwgfx-validate-draw_primitives-header-size-before-division.patch drm-vmwgfx-bound-dma-command-body-size-against-suffix-pointer.patch +hid-logitech-dj-fix-maxfield-check-in-dj-short-report-validation.patch