--- /dev/null
+From 2c202e6c4f4dd19d2e8c1dfac9df05170aa3934f Mon Sep 17 00:00:00 2001
+From: Damien Le Moal <dlemoal@kernel.org>
+Date: Sat, 8 Feb 2025 08:29:15 +0900
+Subject: ata: libahci_platform: Do not set mask_port_map when not needed
+
+From: Damien Le Moal <dlemoal@kernel.org>
+
+commit 2c202e6c4f4dd19d2e8c1dfac9df05170aa3934f upstream.
+
+Commit 8c87215dd3a2 ("ata: libahci_platform: support non-consecutive
+port numbers") modified ahci_platform_get_resources() to allow
+identifying the ports of a controller that are defined as child nodes of
+the controller node in order to support non-consecutive port numbers (as
+defined by the platform device tree).
+
+However, this commit also erroneously sets bit 0 of
+hpriv->mask_port_map when the platform devices tree does not define port
+child nodes, to match the fact that the temporary default number of
+ports used in that case is 1 (which is also consistent with the fact
+that only index 0 of hpriv->phys[] is initialized with the call to
+ahci_platform_get_phy(). But doing so causes ahci_platform_init_host()
+to initialize and probe only the first port, even if this function
+determines that the controller has in fact multiple ports using the
+capability register of the controller (through a call to
+ahci_nr_ports()). This can be seen with the ahci_mvebu driver (Armada
+385 SoC) with the second port declared as "dummy":
+
+ahci-mvebu f10a8000.sata: masking port_map 0x3 -> 0x1
+ahci-mvebu f10a8000.sata: AHCI vers 0001.0000, 32 command slots, 6 Gbps, platform mode
+ahci-mvebu f10a8000.sata: 1/2 ports implemented (port mask 0x1)
+ahci-mvebu f10a8000.sata: flags: 64bit ncq sntf led only pmp fbs pio slum part sxs
+scsi host0: ahci-mvebu
+scsi host1: ahci-mvebu
+ata1: SATA max UDMA/133 mmio [mem 0xf10a8000-0xf10a9fff] port 0x100 irq 40 lpm-pol 0
+ata2: DUMMY
+
+Fix this issue by removing setting bit 0 of hpriv->mask_port_map when
+the platform device tree does not define port child nodes.
+
+Reported-by: Klaus Kudielka <klaus.kudielka@gmail.com>
+Fixes: 8c87215dd3a2 ("ata: libahci_platform: support non-consecutive port numbers")
+Tested-by: Klaus Kudielka <klaus.kudielka@gmail.com>
+Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
+Acked-by: Josua Mayer <josua@solid-run.com>
+Link: https://lore.kernel.org/r/20250207232915.1439174-1-dlemoal@kernel.org
+Signed-off-by: Niklas Cassel <cassel@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/ata/libahci_platform.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/ata/libahci_platform.c
++++ b/drivers/ata/libahci_platform.c
+@@ -651,8 +651,6 @@ struct ahci_host_priv *ahci_platform_get
+ * If no sub-node was found, keep this for device tree
+ * compatibility
+ */
+- hpriv->mask_port_map |= BIT(0);
+-
+ rc = ahci_platform_get_phy(hpriv, 0, dev, dev->of_node);
+ if (rc)
+ goto err_out;
--- /dev/null
+From 590cc4d782487632a52f37c2171bee1eeea29627 Mon Sep 17 00:00:00 2001
+From: HyeongJun An <sammiee5311@gmail.com>
+Date: Thu, 18 Jun 2026 15:37:37 +0900
+Subject: HID: logitech-dj: Fix maxfield check in DJ short report validation
+
+From: HyeongJun An <sammiee5311@gmail.com>
+
+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 <sammiee5311@gmail.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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;
drm-vmwgfx-avoid-destroy_workqueue-null-on-vkms-init-failure.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
+ata-libahci_platform-do-not-set-mask_port_map-when-not-needed.patch
--- /dev/null
+From f6b625639e39bc384a7bddbf134a698d40258b3b Mon Sep 17 00:00:00 2001
+From: Jun Guo <jun.guo@cixtech.com>
+Date: Thu, 15 Jan 2026 17:19:24 +0800
+Subject: spi: spi-cadence: enable SPI_CONTROLLER_MUST_TX
+
+From: Jun Guo <jun.guo@cixtech.com>
+
+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 <jun.guo@cixtech.com>
+Link: https://patch.msgid.link/20260115091924.844179-1-jun.guo@cixtech.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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);
projects / thirdparty / kernel / stable-queue.git / commitdiff
