From: Greg Kroah-Hartman Date: Wed, 5 Aug 2026 12:22:10 +0000 (+0200) Subject: 6.18-stable patches X-Git-Tag: v5.10.263~14 X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=a0a8c408c0f8ee2d0439b3fb57a202aa513e89ae;p=thirdparty%2Fkernel%2Fstable-queue.git 6.18-stable patches added patches: hid-logitech-dj-fix-maxfield-check-in-dj-short-report-validation.patch spi-spi-cadence-enable-spi_controller_must_tx.patch --- diff --git a/queue-6.18/hid-logitech-dj-fix-maxfield-check-in-dj-short-report-validation.patch b/queue-6.18/hid-logitech-dj-fix-maxfield-check-in-dj-short-report-validation.patch new file mode 100644 index 0000000000..6c9e341d0d --- /dev/null +++ b/queue-6.18/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.18/series b/queue-6.18/series index f66d16ed42..f63a8f241c 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -339,3 +339,5 @@ drm-vmwgfx-avoid-destroy_workqueue-null-on-vkms-init-failure.patch drm-vmwgfx-enforce-cursor-size-limits-for-mob-cursors.patch drm-vmwgfx-use-check_add_overflow-for-shader-size-offset-bound.patch drm-vmwgfx-validate-external-bo-copy-bounds-for-both-stride-paths.patch +spi-spi-cadence-enable-spi_controller_must_tx.patch +hid-logitech-dj-fix-maxfield-check-in-dj-short-report-validation.patch diff --git a/queue-6.18/spi-spi-cadence-enable-spi_controller_must_tx.patch b/queue-6.18/spi-spi-cadence-enable-spi_controller_must_tx.patch new file mode 100644 index 0000000000..78fee43639 --- /dev/null +++ b/queue-6.18/spi-spi-cadence-enable-spi_controller_must_tx.patch @@ -0,0 +1,35 @@ +From f6b625639e39bc384a7bddbf134a698d40258b3b Mon Sep 17 00:00:00 2001 +From: Jun Guo +Date: Thu, 15 Jan 2026 17:19:24 +0800 +Subject: spi: spi-cadence: enable SPI_CONTROLLER_MUST_TX + +From: Jun Guo + +commit f6b625639e39bc384a7bddbf134a698d40258b3b upstream. + +During an SPI read operation, even if the xspi->txbuf passed to the +cdns_spi_writerinterface is empty, it is still necessary to call +cdns_spi_write(xspi, CDNS_SPI_TXD, txw); otherwise, the read operation +will fail to obtain data correctly due to a lack of clocks. + +Fixes: 4e00135b2dd1 ("spi: spi-cadence: supports transmission with bits_per_word of 16 and 32") +Reported-by: Rodrigo Alencar <455.rodrigo.alencar@gmail.com> +Closes: https://lore.kernel.org/all/lbijvnnwsnddonmm5pveqzap6iibxhl4maneq43x4j6w64dev6@u75qhm5cwiob/ +Signed-off-by: Jun Guo +Link: https://patch.msgid.link/20260115091924.844179-1-jun.guo@cixtech.com +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + drivers/spi/spi-cadence.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/spi/spi-cadence.c ++++ b/drivers/spi/spi-cadence.c +@@ -735,6 +735,7 @@ static int cdns_spi_probe(struct platfor + ctlr->unprepare_transfer_hardware = cdns_unprepare_transfer_hardware; + ctlr->mode_bits = SPI_CPOL | SPI_CPHA; + ctlr->bits_per_word_mask = SPI_BPW_MASK(8); ++ ctlr->flags = SPI_CONTROLLER_MUST_TX; + + if (of_device_is_compatible(pdev->dev.of_node, "cix,sky1-spi-r1p6")) + ctlr->bits_per_word_mask |= SPI_BPW_MASK(16) | SPI_BPW_MASK(32);