From 995bf4c74479bad709b3d383cdcc27c72ef7bd35 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 7 Jul 2025 00:22:43 -0400 Subject: [PATCH] Fixes for 5.15 Signed-off-by: Sasha Levin --- ...-evaluate-a-method-if-arguments-are-.patch | 51 +++++++ ...low-changing-the-dma-mode-during-ope.patch | 38 +++++ ...-disable-dmas-once-when-dma-mode-is-.patch | 41 +++++ ...ign-cl37-an-sequence-as-per-databook.patch | 89 +++++++++++ ...-pata_cs5536-fix-build-on-32-bit-uml.patch | 38 +++++ ...g-error-handling-when-searching-for-.patch | 45 ++++++ ...guard-display-clock-control-with-run.patch | 67 ++++++++ ...timeline-left-held-on-vma-alloc-erro.patch | 128 ++++++++++++++++ ...ts-change-mock_request-to-return-err.patch | 107 +++++++++++++ ...ix-a-fence-leak-in-submit-error-path.patch | 45 ++++++ ...ct-mtu-comparison-in-enic_change_mtu.patch | 47 ++++++ ...-pci-e-link-substate-to-avoid-perfor.patch | 66 ++++++++ ...set-error-message-in-check_expect_hi.patch | 50 ++++++ ...d-fix-memory-leak-of-ecc-engine-conf.patch | 59 ++++++++ ...-pass-notifications-when-child-class.patch | 109 +++++++++++++ ...c-net-rpc-nfs-when-nfs_fs_proc_net_i.patch | 139 +++++++++++++++++ ...x-a-race-to-wake-on-nfs_layout_drain.patch | 45 ++++++ .../nui-fix-dma_mapping_error-check.patch | 143 ++++++++++++++++++ ...x-mlxbf-tmfifo-fix-vring_desc.len-as.patch | 46 ++++++ ...l-wmi-sysman-fix-wmi-data-block-retr.patch | 141 +++++++++++++++++ ...x-struct-termio-related-ioctl-macros.patch | 58 +++++++ ...n-early-if-callback-is-not-specified.patch | 43 ++++++ ...a-mlx5-fix-cc-counters-query-for-mpv.patch | 38 +++++ ...lize-obj_event-obj_sub_list-before-x.patch | 100 ++++++++++++ ...g-neighbour-pointers-in-rose_rt_devi.patch | 84 ++++++++++ ...-dma-mapping-test-in-qla24xx_get_por.patch | 38 +++++ ...-missing-dma-mapping-error-in-qla4xx.patch | 37 +++++ ...null-pointer-dereference-in-core_scs.patch | 56 +++++++ ...x-spelling-of-a-sysfs-attribute-name.patch | 60 ++++++++ queue-5.15/series | 32 ++++ ...-clear-completion-counter-before-ini.patch | 61 ++++++++ ...kl-remove-warn-on-bad-firmware-input.patch | 43 ++++++ ...op-invalid-source-address-ocb-frames.patch | 42 +++++ 33 files changed, 2186 insertions(+) create mode 100644 queue-5.15/acpica-refuse-to-evaluate-a-method-if-arguments-are-.patch create mode 100644 queue-5.15/alsa-sb-don-t-allow-changing-the-dma-mode-during-ope.patch create mode 100644 queue-5.15/alsa-sb-force-to-disable-dmas-once-when-dma-mode-is-.patch create mode 100644 queue-5.15/amd-xgbe-align-cl37-an-sequence-as-per-databook.patch create mode 100644 queue-5.15/ata-pata_cs5536-fix-build-on-32-bit-uml.patch create mode 100644 queue-5.15/btrfs-fix-missing-error-handling-when-searching-for-.patch create mode 100644 queue-5.15/drm-exynos-fimd-guard-display-clock-control-with-run.patch create mode 100644 queue-5.15/drm-i915-gt-fix-timeline-left-held-on-vma-alloc-erro.patch create mode 100644 queue-5.15/drm-i915-selftests-change-mock_request-to-return-err.patch create mode 100644 queue-5.15/drm-msm-fix-a-fence-leak-in-submit-error-path.patch create mode 100644 queue-5.15/enic-fix-incorrect-mtu-comparison-in-enic_change_mtu.patch create mode 100644 queue-5.15/igc-disable-l1.2-pci-e-link-substate-to-avoid-perfor.patch create mode 100644 queue-5.15/lib-test_objagg-set-error-message-in-check_expect_hi.patch create mode 100644 queue-5.15/mtd-spinand-fix-memory-leak-of-ecc-engine-conf.patch create mode 100644 queue-5.15/net-sched-always-pass-notifications-when-child-class.patch create mode 100644 queue-5.15/nfs-clean-up-proc-net-rpc-nfs-when-nfs_fs_proc_net_i.patch create mode 100644 queue-5.15/nfsv4-pnfs-fix-a-race-to-wake-on-nfs_layout_drain.patch create mode 100644 queue-5.15/nui-fix-dma_mapping_error-check.patch create mode 100644 queue-5.15/platform-mellanox-mlxbf-tmfifo-fix-vring_desc.len-as.patch create mode 100644 queue-5.15/platform-x86-dell-wmi-sysman-fix-wmi-data-block-retr.patch create mode 100644 queue-5.15/powerpc-fix-struct-termio-related-ioctl-macros.patch create mode 100644 queue-5.15/rcu-return-early-if-callback-is-not-specified.patch create mode 100644 queue-5.15/rdma-mlx5-fix-cc-counters-query-for-mpv.patch create mode 100644 queue-5.15/rdma-mlx5-initialize-obj_event-obj_sub_list-before-x.patch create mode 100644 queue-5.15/rose-fix-dangling-neighbour-pointers-in-rose_rt_devi.patch create mode 100644 queue-5.15/scsi-qla2xxx-fix-dma-mapping-test-in-qla24xx_get_por.patch create mode 100644 queue-5.15/scsi-qla4xxx-fix-missing-dma-mapping-error-in-qla4xx.patch create mode 100644 queue-5.15/scsi-target-fix-null-pointer-dereference-in-core_scs.patch create mode 100644 queue-5.15/scsi-ufs-core-fix-spelling-of-a-sysfs-attribute-name.patch create mode 100644 queue-5.15/spi-spi-fsl-dspi-clear-completion-counter-before-ini.patch create mode 100644 queue-5.15/wifi-ath6kl-remove-warn-on-bad-firmware-input.patch create mode 100644 queue-5.15/wifi-mac80211-drop-invalid-source-address-ocb-frames.patch diff --git a/queue-5.15/acpica-refuse-to-evaluate-a-method-if-arguments-are-.patch b/queue-5.15/acpica-refuse-to-evaluate-a-method-if-arguments-are-.patch new file mode 100644 index 0000000000..678b7e0565 --- /dev/null +++ b/queue-5.15/acpica-refuse-to-evaluate-a-method-if-arguments-are-.patch @@ -0,0 +1,51 @@ +From 84aa95517ca6afdecb18401249e255b8ad8b19ea Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Jun 2025 14:17:45 +0200 +Subject: ACPICA: Refuse to evaluate a method if arguments are missing + +From: Rafael J. Wysocki + +[ Upstream commit 6fcab2791543924d438e7fa49276d0998b0a069f ] + +As reported in [1], a platform firmware update that increased the number +of method parameters and forgot to update a least one of its callers, +caused ACPICA to crash due to use-after-free. + +Since this a result of a clear AML issue that arguably cannot be fixed +up by the interpreter (it cannot produce missing data out of thin air), +address it by making ACPICA refuse to evaluate a method if the caller +attempts to pass fewer arguments than expected to it. + +Closes: https://github.com/acpica/acpica/issues/1027 [1] +Reported-by: Peter Williams +Signed-off-by: Rafael J. Wysocki +Reviewed-by: Hans de Goede +Tested-by: Hans de Goede # Dell XPS 9640 with BIOS 1.12.0 +Link: https://patch.msgid.link/5909446.DvuYhMxLoT@rjwysocki.net +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/acpica/dsmethod.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c +index ee1832ba39a24..132ab74935be8 100644 +--- a/drivers/acpi/acpica/dsmethod.c ++++ b/drivers/acpi/acpica/dsmethod.c +@@ -483,6 +483,13 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, + return_ACPI_STATUS(AE_NULL_OBJECT); + } + ++ if (this_walk_state->num_operands < obj_desc->method.param_count) { ++ ACPI_ERROR((AE_INFO, "Missing argument for method [%4.4s]", ++ acpi_ut_get_node_name(method_node))); ++ ++ return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG); ++ } ++ + /* Init for new method, possibly wait on method mutex */ + + status = +-- +2.39.5 + diff --git a/queue-5.15/alsa-sb-don-t-allow-changing-the-dma-mode-during-ope.patch b/queue-5.15/alsa-sb-don-t-allow-changing-the-dma-mode-during-ope.patch new file mode 100644 index 0000000000..e34b71ab1f --- /dev/null +++ b/queue-5.15/alsa-sb-don-t-allow-changing-the-dma-mode-during-ope.patch @@ -0,0 +1,38 @@ +From 4add24b23591f1f6e80d30879191de6c5cfdd2a5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 08:43:19 +0200 +Subject: ALSA: sb: Don't allow changing the DMA mode during operations + +From: Takashi Iwai + +[ Upstream commit ed29e073ba93f2d52832804cabdd831d5d357d33 ] + +When a PCM stream is already running, one shouldn't change the DMA +mode via kcontrol, which may screw up the hardware. Return -EBUSY +instead. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=218185 +Link: https://patch.msgid.link/20250610064322.26787-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/isa/sb/sb16_main.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c +index a9b87e159b2d1..5efbd0a41312b 100644 +--- a/sound/isa/sb/sb16_main.c ++++ b/sound/isa/sb/sb16_main.c +@@ -703,6 +703,9 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ct + unsigned char nval, oval; + int change; + ++ if (chip->mode & (SB_MODE_PLAYBACK | SB_MODE_CAPTURE)) ++ return -EBUSY; ++ + nval = ucontrol->value.enumerated.item[0]; + if (nval > 2) + return -EINVAL; +-- +2.39.5 + diff --git a/queue-5.15/alsa-sb-force-to-disable-dmas-once-when-dma-mode-is-.patch b/queue-5.15/alsa-sb-force-to-disable-dmas-once-when-dma-mode-is-.patch new file mode 100644 index 0000000000..65044ec809 --- /dev/null +++ b/queue-5.15/alsa-sb-force-to-disable-dmas-once-when-dma-mode-is-.patch @@ -0,0 +1,41 @@ +From 33317147fd04c35c937b3959a1ad800161a56fc0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 08:43:20 +0200 +Subject: ALSA: sb: Force to disable DMAs once when DMA mode is changed + +From: Takashi Iwai + +[ Upstream commit 4c267ae2ef349639b4d9ebf00dd28586a82fdbe6 ] + +When the DMA mode is changed on the (still real!) SB AWE32 after +playing a stream and closing, the previous DMA setup was still +silently kept, and it can confuse the hardware, resulting in the +unexpected noises. As a workaround, enforce the disablement of DMA +setups when the DMA setup is changed by the kcontrol. + +https://bugzilla.kernel.org/show_bug.cgi?id=218185 +Link: https://patch.msgid.link/20250610064322.26787-2-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/isa/sb/sb16_main.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c +index 5efbd0a41312b..1497a7822eee6 100644 +--- a/sound/isa/sb/sb16_main.c ++++ b/sound/isa/sb/sb16_main.c +@@ -714,6 +714,10 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ct + change = nval != oval; + snd_sb16_set_dma_mode(chip, nval); + spin_unlock_irqrestore(&chip->reg_lock, flags); ++ if (change) { ++ snd_dma_disable(chip->dma8); ++ snd_dma_disable(chip->dma16); ++ } + return change; + } + +-- +2.39.5 + diff --git a/queue-5.15/amd-xgbe-align-cl37-an-sequence-as-per-databook.patch b/queue-5.15/amd-xgbe-align-cl37-an-sequence-as-per-databook.patch new file mode 100644 index 0000000000..3116d32d4d --- /dev/null +++ b/queue-5.15/amd-xgbe-align-cl37-an-sequence-as-per-databook.patch @@ -0,0 +1,89 @@ +From 110dac3654a01c3d93ca7ad16033e4b7e209da5a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jul 2025 00:56:36 +0530 +Subject: amd-xgbe: align CL37 AN sequence as per databook + +From: Raju Rangoju + +[ Upstream commit 42fd432fe6d320323215ebdf4de4d0d7e56e6792 ] + +Update the Clause 37 Auto-Negotiation implementation to properly align +with the PCS hardware specifications: +- Fix incorrect bit settings in Link Status and Link Duplex fields +- Implement missing sequence steps 2 and 7 + +These changes ensure CL37 auto-negotiation protocol follows the exact +sequence patterns as specified in the hardware databook. + +Fixes: 1bf40ada6290 ("amd-xgbe: Add support for clause 37 auto-negotiation") +Signed-off-by: Raju Rangoju +Link: https://patch.msgid.link/20250630192636.3838291-1-Raju.Rangoju@amd.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 ++ + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 9 +++++++++ + drivers/net/ethernet/amd/xgbe/xgbe.h | 4 ++-- + 3 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h +index 533b8519ec352..c5dc23906a78d 100644 +--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h ++++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h +@@ -1355,6 +1355,8 @@ + #define MDIO_VEND2_CTRL1_SS13 BIT(13) + #endif + ++#define XGBE_VEND2_MAC_AUTO_SW BIT(9) ++ + /* MDIO mask values */ + #define XGBE_AN_CL73_INT_CMPLT BIT(0) + #define XGBE_AN_CL73_INC_LINK BIT(1) +diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +index 60be836b294bb..19fed56b6ee3f 100644 +--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c ++++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +@@ -363,6 +363,10 @@ static void xgbe_an37_set(struct xgbe_prv_data *pdata, bool enable, + reg |= MDIO_VEND2_CTRL1_AN_RESTART; + + XMDIO_WRITE(pdata, MDIO_MMD_VEND2, MDIO_CTRL1, reg); ++ ++ reg = XMDIO_READ(pdata, MDIO_MMD_VEND2, MDIO_PCS_DIG_CTRL); ++ reg |= XGBE_VEND2_MAC_AUTO_SW; ++ XMDIO_WRITE(pdata, MDIO_MMD_VEND2, MDIO_PCS_DIG_CTRL, reg); + } + + static void xgbe_an37_restart(struct xgbe_prv_data *pdata) +@@ -991,6 +995,11 @@ static void xgbe_an37_init(struct xgbe_prv_data *pdata) + + netif_dbg(pdata, link, pdata->netdev, "CL37 AN (%s) initialized\n", + (pdata->an_mode == XGBE_AN_MODE_CL37) ? "BaseX" : "SGMII"); ++ ++ reg = XMDIO_READ(pdata, MDIO_MMD_AN, MDIO_CTRL1); ++ reg &= ~MDIO_AN_CTRL1_ENABLE; ++ XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_CTRL1, reg); ++ + } + + static void xgbe_an73_init(struct xgbe_prv_data *pdata) +diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h +index bb1254bdd8747..27fc9fb00cd73 100644 +--- a/drivers/net/ethernet/amd/xgbe/xgbe.h ++++ b/drivers/net/ethernet/amd/xgbe/xgbe.h +@@ -291,11 +291,11 @@ + #define XGBE_LINK_TIMEOUT 5 + #define XGBE_KR_TRAINING_WAIT_ITER 50 + +-#define XGBE_SGMII_AN_LINK_STATUS BIT(1) ++#define XGBE_SGMII_AN_LINK_DUPLEX BIT(1) + #define XGBE_SGMII_AN_LINK_SPEED (BIT(2) | BIT(3)) + #define XGBE_SGMII_AN_LINK_SPEED_100 0x04 + #define XGBE_SGMII_AN_LINK_SPEED_1000 0x08 +-#define XGBE_SGMII_AN_LINK_DUPLEX BIT(4) ++#define XGBE_SGMII_AN_LINK_STATUS BIT(4) + + /* ECC correctable error notification window (seconds) */ + #define XGBE_ECC_LIMIT 60 +-- +2.39.5 + diff --git a/queue-5.15/ata-pata_cs5536-fix-build-on-32-bit-uml.patch b/queue-5.15/ata-pata_cs5536-fix-build-on-32-bit-uml.patch new file mode 100644 index 0000000000..89e738593c --- /dev/null +++ b/queue-5.15/ata-pata_cs5536-fix-build-on-32-bit-uml.patch @@ -0,0 +1,38 @@ +From 3f96e52929f1946f20c6712354c4beb1a54b3264 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 Jun 2025 11:01:11 +0200 +Subject: ata: pata_cs5536: fix build on 32-bit UML + +From: Johannes Berg + +[ Upstream commit fe5b391fc56f77cf3c22a9dd4f0ce20db0e3533f ] + +On 32-bit ARCH=um, CONFIG_X86_32 is still defined, so it +doesn't indicate building on real X86 machines. There's +no MSR on UML though, so add a check for CONFIG_X86. + +Reported-by: Arnd Bergmann +Signed-off-by: Johannes Berg +Link: https://lore.kernel.org/r/20250606090110.15784-2-johannes@sipsolutions.net +Signed-off-by: Niklas Cassel +Signed-off-by: Sasha Levin +--- + drivers/ata/pata_cs5536.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c +index 760ac6e65216f..3737d1bf1539d 100644 +--- a/drivers/ata/pata_cs5536.c ++++ b/drivers/ata/pata_cs5536.c +@@ -27,7 +27,7 @@ + #include + #include + +-#ifdef CONFIG_X86_32 ++#if defined(CONFIG_X86) && defined(CONFIG_X86_32) + #include + static int use_msr; + module_param_named(msr, use_msr, int, 0644); +-- +2.39.5 + diff --git a/queue-5.15/btrfs-fix-missing-error-handling-when-searching-for-.patch b/queue-5.15/btrfs-fix-missing-error-handling-when-searching-for-.patch new file mode 100644 index 0000000000..fdd1625bff --- /dev/null +++ b/queue-5.15/btrfs-fix-missing-error-handling-when-searching-for-.patch @@ -0,0 +1,45 @@ +From 7c687dd64b4e5b6142ace389cc1aebb767405ee4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Jun 2025 16:57:07 +0100 +Subject: btrfs: fix missing error handling when searching for inode refs + during log replay + +From: Filipe Manana + +[ Upstream commit 6561a40ceced9082f50c374a22d5966cf9fc5f5c ] + +During log replay, at __add_inode_ref(), when we are searching for inode +ref keys we totally ignore if btrfs_search_slot() returns an error. This +may make a log replay succeed when there was an actual error and leave +some metadata inconsistency in a subvolume tree. Fix this by checking if +an error was returned from btrfs_search_slot() and if so, return it to +the caller. + +Fixes: e02119d5a7b4 ("Btrfs: Add a write ahead tree log to optimize synchronous operations") +Reviewed-by: Johannes Thumshirn +Reviewed-by: Qu Wenruo +Signed-off-by: Filipe Manana +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/tree-log.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c +index dcf0dd2093f58..7049a19e07baf 100644 +--- a/fs/btrfs/tree-log.c ++++ b/fs/btrfs/tree-log.c +@@ -1066,7 +1066,9 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, + search_key.type = BTRFS_INODE_REF_KEY; + search_key.offset = parent_objectid; + ret = btrfs_search_slot(NULL, root, &search_key, path, 0, 0); +- if (ret == 0) { ++ if (ret < 0) { ++ return ret; ++ } else if (ret == 0) { + struct btrfs_inode_ref *victim_ref; + unsigned long ptr; + unsigned long ptr_end; +-- +2.39.5 + diff --git a/queue-5.15/drm-exynos-fimd-guard-display-clock-control-with-run.patch b/queue-5.15/drm-exynos-fimd-guard-display-clock-control-with-run.patch new file mode 100644 index 0000000000..9537abac34 --- /dev/null +++ b/queue-5.15/drm-exynos-fimd-guard-display-clock-control-with-run.patch @@ -0,0 +1,67 @@ +From c3b14083c8b8baa1b2f7bb84cc7cadf69129c5ab Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Jun 2025 14:06:26 +0200 +Subject: drm/exynos: fimd: Guard display clock control with runtime PM calls + +From: Marek Szyprowski + +[ Upstream commit 5d91394f236167ac624b823820faf4aa928b889e ] + +Commit c9b1150a68d9 ("drm/atomic-helper: Re-order bridge chain pre-enable +and post-disable") changed the call sequence to the CRTC enable/disable +and bridge pre_enable/post_disable methods, so those bridge methods are +now called when CRTC is not yet enabled. + +This causes a lockup observed on Samsung Peach-Pit/Pi Chromebooks. The +source of this lockup is a call to fimd_dp_clock_enable() function, when +FIMD device is not yet runtime resumed. It worked before the mentioned +commit only because the CRTC implemented by the FIMD driver was always +enabled what guaranteed the FIMD device to be runtime resumed. + +This patch adds runtime PM guards to the fimd_dp_clock_enable() function +to enable its proper operation also when the CRTC implemented by FIMD is +not yet enabled. + +Fixes: 196e059a8a6a ("drm/exynos: convert clock_enable crtc callback to pipeline clock") +Signed-off-by: Marek Szyprowski +Reviewed-by: Tomi Valkeinen +Signed-off-by: Inki Dae +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c +index f25e112a92ed5..2a3152f97c843 100644 +--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c ++++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c +@@ -182,6 +182,7 @@ struct fimd_context { + u32 i80ifcon; + bool i80_if; + bool suspended; ++ bool dp_clk_enabled; + wait_queue_head_t wait_vsync_queue; + atomic_t wait_vsync_event; + atomic_t win_updated; +@@ -1014,7 +1015,18 @@ static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable) + struct fimd_context *ctx = container_of(clk, struct fimd_context, + dp_clk); + u32 val = enable ? DP_MIE_CLK_DP_ENABLE : DP_MIE_CLK_DISABLE; ++ ++ if (enable == ctx->dp_clk_enabled) ++ return; ++ ++ if (enable) ++ pm_runtime_resume_and_get(ctx->dev); ++ ++ ctx->dp_clk_enabled = enable; + writel(val, ctx->regs + DP_MIE_CLKCON); ++ ++ if (!enable) ++ pm_runtime_put(ctx->dev); + } + + static const struct exynos_drm_crtc_ops fimd_crtc_ops = { +-- +2.39.5 + diff --git a/queue-5.15/drm-i915-gt-fix-timeline-left-held-on-vma-alloc-erro.patch b/queue-5.15/drm-i915-gt-fix-timeline-left-held-on-vma-alloc-erro.patch new file mode 100644 index 0000000000..fec1245562 --- /dev/null +++ b/queue-5.15/drm-i915-gt-fix-timeline-left-held-on-vma-alloc-erro.patch @@ -0,0 +1,128 @@ +From de36ab7f68df6ab2fc41dd139e3c61ab2f6bbd1c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 12:42:13 +0200 +Subject: drm/i915/gt: Fix timeline left held on VMA alloc error + +From: Janusz Krzysztofik + +[ Upstream commit a5aa7bc1fca78c7fa127d9e33aa94a0c9066c1d6 ] + +The following error has been reported sporadically by CI when a test +unbinds the i915 driver on a ring submission platform: + +<4> [239.330153] ------------[ cut here ]------------ +<4> [239.330166] i915 0000:00:02.0: [drm] drm_WARN_ON(dev_priv->mm.shrink_count) +<4> [239.330196] WARNING: CPU: 1 PID: 18570 at drivers/gpu/drm/i915/i915_gem.c:1309 i915_gem_cleanup_early+0x13e/0x150 [i915] +... +<4> [239.330640] RIP: 0010:i915_gem_cleanup_early+0x13e/0x150 [i915] +... +<4> [239.330942] Call Trace: +<4> [239.330944] +<4> [239.330949] i915_driver_late_release+0x2b/0xa0 [i915] +<4> [239.331202] i915_driver_release+0x86/0xa0 [i915] +<4> [239.331482] devm_drm_dev_init_release+0x61/0x90 +<4> [239.331494] devm_action_release+0x15/0x30 +<4> [239.331504] release_nodes+0x3d/0x120 +<4> [239.331517] devres_release_all+0x96/0xd0 +<4> [239.331533] device_unbind_cleanup+0x12/0x80 +<4> [239.331543] device_release_driver_internal+0x23a/0x280 +<4> [239.331550] ? bus_find_device+0xa5/0xe0 +<4> [239.331563] device_driver_detach+0x14/0x20 +... +<4> [357.719679] ---[ end trace 0000000000000000 ]--- + +If the test also unloads the i915 module then that's followed with: + +<3> [357.787478] ============================================================================= +<3> [357.788006] BUG i915_vma (Tainted: G U W N ): Objects remaining on __kmem_cache_shutdown() +<3> [357.788031] ----------------------------------------------------------------------------- +<3> [357.788204] Object 0xffff888109e7f480 @offset=29824 +<3> [357.788670] Allocated in i915_vma_instance+0xee/0xc10 [i915] age=292729 cpu=4 pid=2244 +<4> [357.788994] i915_vma_instance+0xee/0xc10 [i915] +<4> [357.789290] init_status_page+0x7b/0x420 [i915] +<4> [357.789532] intel_engines_init+0x1d8/0x980 [i915] +<4> [357.789772] intel_gt_init+0x175/0x450 [i915] +<4> [357.790014] i915_gem_init+0x113/0x340 [i915] +<4> [357.790281] i915_driver_probe+0x847/0xed0 [i915] +<4> [357.790504] i915_pci_probe+0xe6/0x220 [i915] +... + +Closer analysis of CI results history has revealed a dependency of the +error on a few IGT tests, namely: +- igt@api_intel_allocator@fork-simple-stress-signal, +- igt@api_intel_allocator@two-level-inception-interruptible, +- igt@gem_linear_blits@interruptible, +- igt@prime_mmap_coherency@ioctl-errors, +which invisibly trigger the issue, then exhibited with first driver unbind +attempt. + +All of the above tests perform actions which are actively interrupted with +signals. Further debugging has allowed to narrow that scope down to +DRM_IOCTL_I915_GEM_EXECBUFFER2, and ring_context_alloc(), specific to ring +submission, in particular. + +If successful then that function, or its execlists or GuC submission +equivalent, is supposed to be called only once per GEM context engine, +followed by raise of a flag that prevents the function from being called +again. The function is expected to unwind its internal errors itself, so +it may be safely called once more after it returns an error. + +In case of ring submission, the function first gets a reference to the +engine's legacy timeline and then allocates a VMA. If the VMA allocation +fails, e.g. when i915_vma_instance() called from inside is interrupted +with a signal, then ring_context_alloc() fails, leaving the timeline held +referenced. On next I915_GEM_EXECBUFFER2 IOCTL, another reference to the +timeline is got, and only that last one is put on successful completion. +As a consequence, the legacy timeline, with its underlying engine status +page's VMA object, is still held and not released on driver unbind. + +Get the legacy timeline only after successful allocation of the context +engine's VMA. + +v2: Add a note on other submission methods (Krzysztof Karas): + Both execlists and GuC submission use lrc_alloc() which seems free + from a similar issue. + +Fixes: 75d0a7f31eec ("drm/i915: Lift timeline into intel_context") +Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061 +Cc: Chris Wilson +Cc: Matthew Auld +Cc: Krzysztof Karas +Reviewed-by: Sebastian Brzezinka +Reviewed-by: Krzysztof Niemiec +Signed-off-by: Janusz Krzysztofik +Reviewed-by: Nitin Gote +Reviewed-by: Andi Shyti +Signed-off-by: Andi Shyti +Link: https://lore.kernel.org/r/20250611104352.1014011-2-janusz.krzysztofik@linux.intel.com +(cherry picked from commit cc43422b3cc79eacff4c5a8ba0d224688ca9dd4f) +Signed-off-by: Joonas Lahtinen +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c +index 02e18e70c78ea..d85b80156913f 100644 +--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c ++++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c +@@ -563,7 +563,6 @@ static int ring_context_alloc(struct intel_context *ce) + /* One ringbuffer to rule them all */ + GEM_BUG_ON(!engine->legacy.ring); + ce->ring = engine->legacy.ring; +- ce->timeline = intel_timeline_get(engine->legacy.timeline); + + GEM_BUG_ON(ce->state); + if (engine->context_size) { +@@ -576,6 +575,8 @@ static int ring_context_alloc(struct intel_context *ce) + ce->state = vma; + } + ++ ce->timeline = intel_timeline_get(engine->legacy.timeline); ++ + return 0; + } + +-- +2.39.5 + diff --git a/queue-5.15/drm-i915-selftests-change-mock_request-to-return-err.patch b/queue-5.15/drm-i915-selftests-change-mock_request-to-return-err.patch new file mode 100644 index 0000000000..94decfb75b --- /dev/null +++ b/queue-5.15/drm-i915-selftests-change-mock_request-to-return-err.patch @@ -0,0 +1,107 @@ +From dcfcd28d6cb182f2d228a8641aba9c0b91600815 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 25 Jun 2025 10:21:58 -0500 +Subject: drm/i915/selftests: Change mock_request() to return error pointers + +From: Dan Carpenter + +[ Upstream commit caa7c7a76b78ce41d347003f84975125383e6b59 ] + +There was an error pointer vs NULL bug in __igt_breadcrumbs_smoketest(). +The __mock_request_alloc() function implements the +smoketest->request_alloc() function pointer. It was supposed to return +error pointers, but it propogates the NULL return from mock_request() +so in the event of a failure, it would lead to a NULL pointer +dereference. + +To fix this, change the mock_request() function to return error pointers +and update all the callers to expect that. + +Fixes: 52c0fdb25c7c ("drm/i915: Replace global breadcrumbs with per-context interrupt tracking") +Signed-off-by: Dan Carpenter +Reviewed-by: Rodrigo Vivi +Link: https://lore.kernel.org/r/685c1417.050a0220.696f5.5c05@mx.google.com +Signed-off-by: Rodrigo Vivi +(cherry picked from commit 778fa8ad5f0f23397d045c7ebca048ce8def1c43) +Signed-off-by: Joonas Lahtinen +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/i915/selftests/i915_request.c | 20 +++++++++---------- + drivers/gpu/drm/i915/selftests/mock_request.c | 2 +- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c +index 0e1a64b179a55..a4f1f5d2d9831 100644 +--- a/drivers/gpu/drm/i915/selftests/i915_request.c ++++ b/drivers/gpu/drm/i915/selftests/i915_request.c +@@ -72,8 +72,8 @@ static int igt_add_request(void *arg) + /* Basic preliminary test to create a request and let it loose! */ + + request = mock_request(rcs0(i915)->kernel_context, HZ / 10); +- if (!request) +- return -ENOMEM; ++ if (IS_ERR(request)) ++ return PTR_ERR(request); + + i915_request_add(request); + +@@ -90,8 +90,8 @@ static int igt_wait_request(void *arg) + /* Submit a request, then wait upon it */ + + request = mock_request(rcs0(i915)->kernel_context, T); +- if (!request) +- return -ENOMEM; ++ if (IS_ERR(request)) ++ return PTR_ERR(request); + + i915_request_get(request); + +@@ -159,8 +159,8 @@ static int igt_fence_wait(void *arg) + /* Submit a request, treat it as a fence and wait upon it */ + + request = mock_request(rcs0(i915)->kernel_context, T); +- if (!request) +- return -ENOMEM; ++ if (IS_ERR(request)) ++ return PTR_ERR(request); + + if (dma_fence_wait_timeout(&request->fence, false, T) != -ETIME) { + pr_err("fence wait success before submit (expected timeout)!\n"); +@@ -214,8 +214,8 @@ static int igt_request_rewind(void *arg) + GEM_BUG_ON(IS_ERR(ce)); + request = mock_request(ce, 2 * HZ); + intel_context_put(ce); +- if (!request) { +- err = -ENOMEM; ++ if (IS_ERR(request)) { ++ err = PTR_ERR(request); + goto err_context_0; + } + +@@ -228,8 +228,8 @@ static int igt_request_rewind(void *arg) + GEM_BUG_ON(IS_ERR(ce)); + vip = mock_request(ce, 0); + intel_context_put(ce); +- if (!vip) { +- err = -ENOMEM; ++ if (IS_ERR(vip)) { ++ err = PTR_ERR(vip); + goto err_context_1; + } + +diff --git a/drivers/gpu/drm/i915/selftests/mock_request.c b/drivers/gpu/drm/i915/selftests/mock_request.c +index 09f747228dff5..1b0cf073e9643 100644 +--- a/drivers/gpu/drm/i915/selftests/mock_request.c ++++ b/drivers/gpu/drm/i915/selftests/mock_request.c +@@ -35,7 +35,7 @@ mock_request(struct intel_context *ce, unsigned long delay) + /* NB the i915->requests slab cache is enlarged to fit mock_request */ + request = intel_context_create_request(ce); + if (IS_ERR(request)) +- return NULL; ++ return request; + + request->mock.delay = delay; + return request; +-- +2.39.5 + diff --git a/queue-5.15/drm-msm-fix-a-fence-leak-in-submit-error-path.patch b/queue-5.15/drm-msm-fix-a-fence-leak-in-submit-error-path.patch new file mode 100644 index 0000000000..691ff635e8 --- /dev/null +++ b/queue-5.15/drm-msm-fix-a-fence-leak-in-submit-error-path.patch @@ -0,0 +1,45 @@ +From 9f6954679b4cc7f4cee20ebbb3a462c8245d3702 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 14 May 2025 09:33:32 -0700 +Subject: drm/msm: Fix a fence leak in submit error path + +From: Rob Clark + +[ Upstream commit 5d319f75ccf7f0927425a7545aa1a22b3eedc189 ] + +In error paths, we could unref the submit without calling +drm_sched_entity_push_job(), so msm_job_free() will never get +called. Since drm_sched_job_cleanup() will NULL out the +s_fence, we can use that to detect this case. + +Signed-off-by: Rob Clark +Patchwork: https://patchwork.freedesktop.org/patch/653584/ +Signed-off-by: Rob Clark +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/msm_gem_submit.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c +index fc2fb1019ea1c..2ffb2ca88ffe1 100644 +--- a/drivers/gpu/drm/msm/msm_gem_submit.c ++++ b/drivers/gpu/drm/msm/msm_gem_submit.c +@@ -76,6 +76,15 @@ void __msm_gem_submit_destroy(struct kref *kref) + struct dma_fence *fence; + unsigned i; + ++ /* ++ * In error paths, we could unref the submit without calling ++ * drm_sched_entity_push_job(), so msm_job_free() will never ++ * get called. Since drm_sched_job_cleanup() will NULL out ++ * s_fence, we can use that to detect this case. ++ */ ++ if (submit->base.s_fence) ++ drm_sched_job_cleanup(&submit->base); ++ + if (submit->fence_id) { + mutex_lock(&submit->queue->lock); + idr_remove(&submit->queue->fence_idr, submit->fence_id); +-- +2.39.5 + diff --git a/queue-5.15/enic-fix-incorrect-mtu-comparison-in-enic_change_mtu.patch b/queue-5.15/enic-fix-incorrect-mtu-comparison-in-enic_change_mtu.patch new file mode 100644 index 0000000000..35726db588 --- /dev/null +++ b/queue-5.15/enic-fix-incorrect-mtu-comparison-in-enic_change_mtu.patch @@ -0,0 +1,47 @@ +From 2e1436b359405702f6dfb05998a7b5d6b1ab02ac Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 28 Jun 2025 07:56:05 -0700 +Subject: enic: fix incorrect MTU comparison in enic_change_mtu() + +From: Alok Tiwari + +[ Upstream commit aaf2b2480375099c022a82023e1cd772bf1c6a5d ] + +The comparison in enic_change_mtu() incorrectly used the current +netdev->mtu instead of the new new_mtu value when warning about +an MTU exceeding the port MTU. This could suppress valid warnings +or issue incorrect ones. + +Fix the condition and log to properly reflect the new_mtu. + +Fixes: ab123fe071c9 ("enic: handle mtu change for vf properly") +Signed-off-by: Alok Tiwari +Acked-by: John Daley +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20250628145612.476096-1-alok.a.tiwari@oracle.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cisco/enic/enic_main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c +index 52bc164a1cfbc..a3f57069e972b 100644 +--- a/drivers/net/ethernet/cisco/enic/enic_main.c ++++ b/drivers/net/ethernet/cisco/enic/enic_main.c +@@ -2058,10 +2058,10 @@ static int enic_change_mtu(struct net_device *netdev, int new_mtu) + if (enic_is_dynamic(enic) || enic_is_sriov_vf(enic)) + return -EOPNOTSUPP; + +- if (netdev->mtu > enic->port_mtu) ++ if (new_mtu > enic->port_mtu) + netdev_warn(netdev, + "interface MTU (%d) set higher than port MTU (%d)\n", +- netdev->mtu, enic->port_mtu); ++ new_mtu, enic->port_mtu); + + return _enic_change_mtu(netdev, new_mtu); + } +-- +2.39.5 + diff --git a/queue-5.15/igc-disable-l1.2-pci-e-link-substate-to-avoid-perfor.patch b/queue-5.15/igc-disable-l1.2-pci-e-link-substate-to-avoid-perfor.patch new file mode 100644 index 0000000000..60a862a0ce --- /dev/null +++ b/queue-5.15/igc-disable-l1.2-pci-e-link-substate-to-avoid-perfor.patch @@ -0,0 +1,66 @@ +From ac63e17f33de8d053f3ddab82a61d575b8d1a47e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 15:52:54 +0300 +Subject: igc: disable L1.2 PCI-E link substate to avoid performance issue + +From: Vitaly Lifshits + +[ Upstream commit 0325143b59c6c6d79987afc57d2456e7a20d13b7 ] + +I226 devices advertise support for the PCI-E link L1.2 substate. However, +due to a hardware limitation, the exit latency from this low-power state +is longer than the packet buffer can tolerate under high traffic +conditions. This can lead to packet loss and degraded performance. + +To mitigate this, disable the L1.2 substate. The increased power draw +between L1.1 and L1.2 is insignificant. + +Fixes: 43546211738e ("igc: Add new device ID's") +Link: https://lore.kernel.org/intel-wired-lan/15248b4f-3271-42dd-8e35-02bfc92b25e1@intel.com +Signed-off-by: Vitaly Lifshits +Reviewed-by: Aleksandr Loktionov +Tested-by: Mor Bar-Gabay +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/igc/igc_main.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c +index 4186e5732f972..f52c1674d19bd 100644 +--- a/drivers/net/ethernet/intel/igc/igc_main.c ++++ b/drivers/net/ethernet/intel/igc/igc_main.c +@@ -6549,6 +6549,10 @@ static int igc_probe(struct pci_dev *pdev, + adapter->port_num = hw->bus.func; + adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE); + ++ /* Disable ASPM L1.2 on I226 devices to avoid packet loss */ ++ if (igc_is_device_id_i226(hw)) ++ pci_disable_link_state(pdev, PCIE_LINK_STATE_L1_2); ++ + err = pci_save_state(pdev); + if (err) + goto err_ioremap; +@@ -6914,6 +6918,9 @@ static int __maybe_unused igc_resume(struct device *dev) + pci_enable_wake(pdev, PCI_D3hot, 0); + pci_enable_wake(pdev, PCI_D3cold, 0); + ++ if (igc_is_device_id_i226(hw)) ++ pci_disable_link_state(pdev, PCIE_LINK_STATE_L1_2); ++ + if (igc_init_interrupt_scheme(adapter, true)) { + netdev_err(netdev, "Unable to allocate memory for queues\n"); + return -ENOMEM; +@@ -7029,6 +7036,9 @@ static pci_ers_result_t igc_io_slot_reset(struct pci_dev *pdev) + pci_enable_wake(pdev, PCI_D3hot, 0); + pci_enable_wake(pdev, PCI_D3cold, 0); + ++ if (igc_is_device_id_i226(hw)) ++ pci_disable_link_state_locked(pdev, PCIE_LINK_STATE_L1_2); ++ + /* In case of PCI error, adapter loses its HW address + * so we should re-assign it here. + */ +-- +2.39.5 + diff --git a/queue-5.15/lib-test_objagg-set-error-message-in-check_expect_hi.patch b/queue-5.15/lib-test_objagg-set-error-message-in-check_expect_hi.patch new file mode 100644 index 0000000000..33073cf139 --- /dev/null +++ b/queue-5.15/lib-test_objagg-set-error-message-in-check_expect_hi.patch @@ -0,0 +1,50 @@ +From 6c568ff2386ed494f68fa29426ccc4ee8d7a833e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jun 2025 14:36:40 -0500 +Subject: lib: test_objagg: Set error message in check_expect_hints_stats() + +From: Dan Carpenter + +[ Upstream commit e6ed134a4ef592fe1fd0cafac9683813b3c8f3e8 ] + +Smatch complains that the error message isn't set in the caller: + + lib/test_objagg.c:923 test_hints_case2() + error: uninitialized symbol 'errmsg'. + +This static checker warning only showed up after a recent refactoring +but the bug dates back to when the code was originally added. This +likely doesn't affect anything in real life. + +Reported-by: kernel test robot +Closes: https://lore.kernel.org/r/202506281403.DsuyHFTZ-lkp@intel.com/ +Fixes: 0a020d416d0a ("lib: introduce initial implementation of object aggregation manager") +Signed-off-by: Dan Carpenter +Reviewed-by: Ido Schimmel +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/8548f423-2e3b-4bb7-b816-5041de2762aa@sabinyo.mountain +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + lib/test_objagg.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/test_objagg.c b/lib/test_objagg.c +index da137939a4100..78d25ab19a960 100644 +--- a/lib/test_objagg.c ++++ b/lib/test_objagg.c +@@ -899,8 +899,10 @@ static int check_expect_hints_stats(struct objagg_hints *objagg_hints, + int err; + + stats = objagg_hints_stats_get(objagg_hints); +- if (IS_ERR(stats)) ++ if (IS_ERR(stats)) { ++ *errmsg = "objagg_hints_stats_get() failed."; + return PTR_ERR(stats); ++ } + err = __check_expect_stats(stats, expect_stats, errmsg); + objagg_stats_put(stats); + return err; +-- +2.39.5 + diff --git a/queue-5.15/mtd-spinand-fix-memory-leak-of-ecc-engine-conf.patch b/queue-5.15/mtd-spinand-fix-memory-leak-of-ecc-engine-conf.patch new file mode 100644 index 0000000000..54240a5add --- /dev/null +++ b/queue-5.15/mtd-spinand-fix-memory-leak-of-ecc-engine-conf.patch @@ -0,0 +1,59 @@ +From 058aaa84bd2a00a4cb9d98003c5533149cee3b96 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Jun 2025 13:35:16 +0200 +Subject: mtd: spinand: fix memory leak of ECC engine conf + +From: Pablo Martin-Gomez + +[ Upstream commit 6463cbe08b0cbf9bba8763306764f5fd643023e1 ] + +Memory allocated for the ECC engine conf is not released during spinand +cleanup. Below kmemleak trace is seen for this memory leak: + +unreferenced object 0xffffff80064f00e0 (size 8): + comm "swapper/0", pid 1, jiffies 4294937458 + hex dump (first 8 bytes): + 00 00 00 00 00 00 00 00 ........ + backtrace (crc 0): + kmemleak_alloc+0x30/0x40 + __kmalloc_cache_noprof+0x208/0x3c0 + spinand_ondie_ecc_init_ctx+0x114/0x200 + nand_ecc_init_ctx+0x70/0xa8 + nanddev_ecc_engine_init+0xec/0x27c + spinand_probe+0xa2c/0x1620 + spi_mem_probe+0x130/0x21c + spi_probe+0xf0/0x170 + really_probe+0x17c/0x6e8 + __driver_probe_device+0x17c/0x21c + driver_probe_device+0x58/0x180 + __device_attach_driver+0x15c/0x1f8 + bus_for_each_drv+0xec/0x150 + __device_attach+0x188/0x24c + device_initial_probe+0x10/0x20 + bus_probe_device+0x11c/0x160 + +Fix the leak by calling nanddev_ecc_engine_cleanup() inside +spinand_cleanup(). + +Signed-off-by: Pablo Martin-Gomez +Signed-off-by: Miquel Raynal +Signed-off-by: Sasha Levin +--- + drivers/mtd/nand/spi/core.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c +index 2c8685f1f2fa7..80d0112d18fa6 100644 +--- a/drivers/mtd/nand/spi/core.c ++++ b/drivers/mtd/nand/spi/core.c +@@ -1271,6 +1271,7 @@ static void spinand_cleanup(struct spinand_device *spinand) + { + struct nand_device *nand = spinand_to_nand(spinand); + ++ nanddev_ecc_engine_cleanup(nand); + nanddev_cleanup(nand); + spinand_manufacturer_cleanup(spinand); + kfree(spinand->databuf); +-- +2.39.5 + diff --git a/queue-5.15/net-sched-always-pass-notifications-when-child-class.patch b/queue-5.15/net-sched-always-pass-notifications-when-child-class.patch new file mode 100644 index 0000000000..2e2363675d --- /dev/null +++ b/queue-5.15/net-sched-always-pass-notifications-when-child-class.patch @@ -0,0 +1,109 @@ +From 6fd9811056e7ffdcac5e76d64e3b28607b090b8a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jun 2025 15:27:30 +0200 +Subject: net/sched: Always pass notifications when child class becomes empty + +From: Lion Ackermann + +[ Upstream commit 103406b38c600fec1fe375a77b27d87e314aea09 ] + +Certain classful qdiscs may invoke their classes' dequeue handler on an +enqueue operation. This may unexpectedly empty the child qdisc and thus +make an in-flight class passive via qlen_notify(). Most qdiscs do not +expect such behaviour at this point in time and may re-activate the +class eventually anyways which will lead to a use-after-free. + +The referenced fix commit attempted to fix this behavior for the HFSC +case by moving the backlog accounting around, though this turned out to +be incomplete since the parent's parent may run into the issue too. +The following reproducer demonstrates this use-after-free: + + tc qdisc add dev lo root handle 1: drr + tc filter add dev lo parent 1: basic classid 1:1 + tc class add dev lo parent 1: classid 1:1 drr + tc qdisc add dev lo parent 1:1 handle 2: hfsc def 1 + tc class add dev lo parent 2: classid 2:1 hfsc rt m1 8 d 1 m2 0 + tc qdisc add dev lo parent 2:1 handle 3: netem + tc qdisc add dev lo parent 3:1 handle 4: blackhole + + echo 1 | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888 + tc class delete dev lo classid 1:1 + echo 1 | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888 + +Since backlog accounting issues leading to a use-after-frees on stale +class pointers is a recurring pattern at this point, this patch takes +a different approach. Instead of trying to fix the accounting, the patch +ensures that qdisc_tree_reduce_backlog always calls qlen_notify when +the child qdisc is empty. This solves the problem because deletion of +qdiscs always involves a call to qdisc_reset() and / or +qdisc_purge_queue() which ultimately resets its qlen to 0 thus causing +the following qdisc_tree_reduce_backlog() to report to the parent. Note +that this may call qlen_notify on passive classes multiple times. This +is not a problem after the recent patch series that made all the +classful qdiscs qlen_notify() handlers idempotent. + +Fixes: 3f981138109f ("sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue()") +Signed-off-by: Lion Ackermann +Reviewed-by: Jamal Hadi Salim +Acked-by: Cong Wang +Acked-by: Jamal Hadi Salim +Link: https://patch.msgid.link/d912cbd7-193b-4269-9857-525bee8bbb6a@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/sched/sch_api.c | 19 +++++-------------- + 1 file changed, 5 insertions(+), 14 deletions(-) + +diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c +index d9ce273ba43d8..222921b4751f3 100644 +--- a/net/sched/sch_api.c ++++ b/net/sched/sch_api.c +@@ -768,15 +768,12 @@ static u32 qdisc_alloc_handle(struct net_device *dev) + + void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len) + { +- bool qdisc_is_offloaded = sch->flags & TCQ_F_OFFLOADED; + const struct Qdisc_class_ops *cops; + unsigned long cl; + u32 parentid; + bool notify; + int drops; + +- if (n == 0 && len == 0) +- return; + drops = max_t(int, n, 0); + rcu_read_lock(); + while ((parentid = sch->parent)) { +@@ -785,17 +782,8 @@ void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len) + + if (sch->flags & TCQ_F_NOPARENT) + break; +- /* Notify parent qdisc only if child qdisc becomes empty. +- * +- * If child was empty even before update then backlog +- * counter is screwed and we skip notification because +- * parent class is already passive. +- * +- * If the original child was offloaded then it is allowed +- * to be seem as empty, so the parent is notified anyway. +- */ +- notify = !sch->q.qlen && !WARN_ON_ONCE(!n && +- !qdisc_is_offloaded); ++ /* Notify parent qdisc only if child qdisc becomes empty. */ ++ notify = !sch->q.qlen; + /* TODO: perform the search on a per txq basis */ + sch = qdisc_lookup(qdisc_dev(sch), TC_H_MAJ(parentid)); + if (sch == NULL) { +@@ -804,6 +792,9 @@ void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len) + } + cops = sch->ops->cl_ops; + if (notify && cops->qlen_notify) { ++ /* Note that qlen_notify must be idempotent as it may get called ++ * multiple times. ++ */ + cl = cops->find(sch, parentid); + cops->qlen_notify(sch, cl); + } +-- +2.39.5 + diff --git a/queue-5.15/nfs-clean-up-proc-net-rpc-nfs-when-nfs_fs_proc_net_i.patch b/queue-5.15/nfs-clean-up-proc-net-rpc-nfs-when-nfs_fs_proc_net_i.patch new file mode 100644 index 0000000000..5fe91a6d94 --- /dev/null +++ b/queue-5.15/nfs-clean-up-proc-net-rpc-nfs-when-nfs_fs_proc_net_i.patch @@ -0,0 +1,139 @@ +From e8cac0bf28685643eb242c54b7a21edab25a62a6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 12 Jun 2025 14:52:50 -0700 +Subject: nfs: Clean up /proc/net/rpc/nfs when nfs_fs_proc_net_init() fails. + +From: Kuniyuki Iwashima + +[ Upstream commit e8d6f3ab59468e230f3253efe5cb63efa35289f7 ] + +syzbot reported a warning below [1] following a fault injection in +nfs_fs_proc_net_init(). [0] + +When nfs_fs_proc_net_init() fails, /proc/net/rpc/nfs is not removed. + +Later, rpc_proc_exit() tries to remove /proc/net/rpc, and the warning +is logged as the directory is not empty. + +Let's handle the error of nfs_fs_proc_net_init() properly. + +[0]: +FAULT_INJECTION: forcing a failure. +name failslab, interval 1, probability 0, space 0, times 0 +CPU: 1 UID: 0 PID: 6120 Comm: syz.2.27 Not tainted 6.16.0-rc1-syzkaller-00010-g2c4a1f3fe03e #0 PREEMPT(full) +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 +Call Trace: + + dump_stack_lvl (lib/dump_stack.c:123) + should_fail_ex (lib/fault-inject.c:73 lib/fault-inject.c:174) + should_failslab (mm/failslab.c:46) + kmem_cache_alloc_noprof (mm/slub.c:4178 mm/slub.c:4204) + __proc_create (fs/proc/generic.c:427) + proc_create_reg (fs/proc/generic.c:554) + proc_create_net_data (fs/proc/proc_net.c:120) + nfs_fs_proc_net_init (fs/nfs/client.c:1409) + nfs_net_init (fs/nfs/inode.c:2600) + ops_init (net/core/net_namespace.c:138) + setup_net (net/core/net_namespace.c:443) + copy_net_ns (net/core/net_namespace.c:576) + create_new_namespaces (kernel/nsproxy.c:110) + unshare_nsproxy_namespaces (kernel/nsproxy.c:218 (discriminator 4)) + ksys_unshare (kernel/fork.c:3123) + __x64_sys_unshare (kernel/fork.c:3190) + do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94) + entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) + + +[1]: +remove_proc_entry: removing non-empty directory 'net/rpc', leaking at least 'nfs' + WARNING: CPU: 1 PID: 6120 at fs/proc/generic.c:727 remove_proc_entry+0x45e/0x530 fs/proc/generic.c:727 +Modules linked in: +CPU: 1 UID: 0 PID: 6120 Comm: syz.2.27 Not tainted 6.16.0-rc1-syzkaller-00010-g2c4a1f3fe03e #0 PREEMPT(full) +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 + RIP: 0010:remove_proc_entry+0x45e/0x530 fs/proc/generic.c:727 +Code: 3c 02 00 0f 85 85 00 00 00 48 8b 93 d8 00 00 00 4d 89 f0 4c 89 e9 48 c7 c6 40 ba a2 8b 48 c7 c7 60 b9 a2 8b e8 33 81 1d ff 90 <0f> 0b 90 90 e9 5f fe ff ff e8 04 69 5e ff 90 48 b8 00 00 00 00 00 +RSP: 0018:ffffc90003637b08 EFLAGS: 00010282 +RAX: 0000000000000000 RBX: ffff88805f534140 RCX: ffffffff817a92c8 +RDX: ffff88807da99e00 RSI: ffffffff817a92d5 RDI: 0000000000000001 +RBP: ffff888033431ac0 R08: 0000000000000001 R09: 0000000000000000 +R10: 0000000000000001 R11: 0000000000000001 R12: ffff888033431a00 +R13: ffff888033431ae4 R14: ffff888033184724 R15: dffffc0000000000 +FS: 0000555580328500(0000) GS:ffff888124a62000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 00007f71733743e0 CR3: 000000007f618000 CR4: 00000000003526f0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +Call Trace: + + sunrpc_exit_net+0x46/0x90 net/sunrpc/sunrpc_syms.c:76 + ops_exit_list net/core/net_namespace.c:200 [inline] + ops_undo_list+0x2eb/0xab0 net/core/net_namespace.c:253 + setup_net+0x2e1/0x510 net/core/net_namespace.c:457 + copy_net_ns+0x2a6/0x5f0 net/core/net_namespace.c:574 + create_new_namespaces+0x3ea/0xa90 kernel/nsproxy.c:110 + unshare_nsproxy_namespaces+0xc0/0x1f0 kernel/nsproxy.c:218 + ksys_unshare+0x45b/0xa40 kernel/fork.c:3121 + __do_sys_unshare kernel/fork.c:3192 [inline] + __se_sys_unshare kernel/fork.c:3190 [inline] + __x64_sys_unshare+0x31/0x40 kernel/fork.c:3190 + do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] + do_syscall_64+0xcd/0x490 arch/x86/entry/syscall_64.c:94 + entry_SYSCALL_64_after_hwframe+0x77/0x7f +RIP: 0033:0x7fa1a6b8e929 +Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 +RSP: 002b:00007fff3a090368 EFLAGS: 00000246 ORIG_RAX: 0000000000000110 +RAX: ffffffffffffffda RBX: 00007fa1a6db5fa0 RCX: 00007fa1a6b8e929 +RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000040000080 +RBP: 00007fa1a6c10b39 R08: 0000000000000000 R09: 0000000000000000 +R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 +R13: 00007fa1a6db5fa0 R14: 00007fa1a6db5fa0 R15: 0000000000000001 + + +Fixes: d47151b79e32 ("nfs: expose /proc/net/sunrpc/nfs in net namespaces") +Reported-by: syzbot+a4cc4ac22daa4a71b87c@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=a4cc4ac22daa4a71b87c +Tested-by: syzbot+a4cc4ac22daa4a71b87c@syzkaller.appspotmail.com +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/inode.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c +index 28c24079c57a8..a8ac939edcf7e 100644 +--- a/fs/nfs/inode.c ++++ b/fs/nfs/inode.c +@@ -2457,15 +2457,26 @@ EXPORT_SYMBOL_GPL(nfs_net_id); + static int nfs_net_init(struct net *net) + { + struct nfs_net *nn = net_generic(net, nfs_net_id); ++ int err; + + nfs_clients_init(net); + + if (!rpc_proc_register(net, &nn->rpcstats)) { +- nfs_clients_exit(net); +- return -ENOMEM; ++ err = -ENOMEM; ++ goto err_proc_rpc; + } + +- return nfs_fs_proc_net_init(net); ++ err = nfs_fs_proc_net_init(net); ++ if (err) ++ goto err_proc_nfs; ++ ++ return 0; ++ ++err_proc_nfs: ++ rpc_proc_unregister(net, "nfs"); ++err_proc_rpc: ++ nfs_clients_exit(net); ++ return err; + } + + static void nfs_net_exit(struct net *net) +-- +2.39.5 + diff --git a/queue-5.15/nfsv4-pnfs-fix-a-race-to-wake-on-nfs_layout_drain.patch b/queue-5.15/nfsv4-pnfs-fix-a-race-to-wake-on-nfs_layout_drain.patch new file mode 100644 index 0000000000..117ed16e8d --- /dev/null +++ b/queue-5.15/nfsv4-pnfs-fix-a-race-to-wake-on-nfs_layout_drain.patch @@ -0,0 +1,45 @@ +From d3698a3be4b7dc60dcc9cc553f3b89a566b0f18a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 19 Jun 2025 11:02:21 -0400 +Subject: NFSv4/pNFS: Fix a race to wake on NFS_LAYOUT_DRAIN + +From: Benjamin Coddington + +[ Upstream commit c01776287414ca43412d1319d2877cbad65444ac ] + +We found a few different systems hung up in writeback waiting on the same +page lock, and one task waiting on the NFS_LAYOUT_DRAIN bit in +pnfs_update_layout(), however the pnfs_layout_hdr's plh_outstanding count +was zero. + +It seems most likely that this is another race between the waiter and waker +similar to commit ed0172af5d6f ("SUNRPC: Fix a race to wake a sync task"). +Fix it up by applying the advised barrier. + +Fixes: 880265c77ac4 ("pNFS: Avoid a live lock condition in pnfs_update_layout()") +Signed-off-by: Benjamin Coddington +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/pnfs.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c +index 83935bb1719ad..b41c6fced75ac 100644 +--- a/fs/nfs/pnfs.c ++++ b/fs/nfs/pnfs.c +@@ -1927,8 +1927,10 @@ static void nfs_layoutget_begin(struct pnfs_layout_hdr *lo) + static void nfs_layoutget_end(struct pnfs_layout_hdr *lo) + { + if (atomic_dec_and_test(&lo->plh_outstanding) && +- test_and_clear_bit(NFS_LAYOUT_DRAIN, &lo->plh_flags)) ++ test_and_clear_bit(NFS_LAYOUT_DRAIN, &lo->plh_flags)) { ++ smp_mb__after_atomic(); + wake_up_bit(&lo->plh_flags, NFS_LAYOUT_DRAIN); ++ } + } + + static bool pnfs_is_first_layoutget(struct pnfs_layout_hdr *lo) +-- +2.39.5 + diff --git a/queue-5.15/nui-fix-dma_mapping_error-check.patch b/queue-5.15/nui-fix-dma_mapping_error-check.patch new file mode 100644 index 0000000000..f3840f405d --- /dev/null +++ b/queue-5.15/nui-fix-dma_mapping_error-check.patch @@ -0,0 +1,143 @@ +From c44c1d4a6dfc9816aba45c0c93ba196e4727d115 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jun 2025 10:36:43 +0200 +Subject: nui: Fix dma_mapping_error() check + +From: Thomas Fourier + +[ Upstream commit 561aa0e22b70a5e7246b73d62a824b3aef3fc375 ] + +dma_map_XXX() functions return values DMA_MAPPING_ERROR as error values +which is often ~0. The error value should be tested with +dma_mapping_error(). + +This patch creates a new function in niu_ops to test if the mapping +failed. The test is fixed in niu_rbr_add_page(), added in +niu_start_xmit() and the successfully mapped pages are unmaped upon error. + +Fixes: ec2deec1f352 ("niu: Fix to check for dma mapping errors.") +Signed-off-by: Thomas Fourier +Reviewed-by: Simon Horman +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/sun/niu.c | 31 ++++++++++++++++++++++++++++++- + drivers/net/ethernet/sun/niu.h | 4 ++++ + 2 files changed, 34 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c +index 3fdc7c9824a39..8795063432838 100644 +--- a/drivers/net/ethernet/sun/niu.c ++++ b/drivers/net/ethernet/sun/niu.c +@@ -3317,7 +3317,7 @@ static int niu_rbr_add_page(struct niu *np, struct rx_ring_info *rp, + + addr = np->ops->map_page(np->device, page, 0, + PAGE_SIZE, DMA_FROM_DEVICE); +- if (!addr) { ++ if (np->ops->mapping_error(np->device, addr)) { + __free_page(page); + return -ENOMEM; + } +@@ -6654,6 +6654,8 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb, + len = skb_headlen(skb); + mapping = np->ops->map_single(np->device, skb->data, + len, DMA_TO_DEVICE); ++ if (np->ops->mapping_error(np->device, mapping)) ++ goto out_drop; + + prod = rp->prod; + +@@ -6695,6 +6697,8 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb, + mapping = np->ops->map_page(np->device, skb_frag_page(frag), + skb_frag_off(frag), len, + DMA_TO_DEVICE); ++ if (np->ops->mapping_error(np->device, mapping)) ++ goto out_unmap; + + rp->tx_buffs[prod].skb = NULL; + rp->tx_buffs[prod].mapping = mapping; +@@ -6719,6 +6723,19 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb, + out: + return NETDEV_TX_OK; + ++out_unmap: ++ while (i--) { ++ const skb_frag_t *frag; ++ ++ prod = PREVIOUS_TX(rp, prod); ++ frag = &skb_shinfo(skb)->frags[i]; ++ np->ops->unmap_page(np->device, rp->tx_buffs[prod].mapping, ++ skb_frag_size(frag), DMA_TO_DEVICE); ++ } ++ ++ np->ops->unmap_single(np->device, rp->tx_buffs[rp->prod].mapping, ++ skb_headlen(skb), DMA_TO_DEVICE); ++ + out_drop: + rp->tx_errors++; + kfree_skb(skb); +@@ -9612,6 +9629,11 @@ static void niu_pci_unmap_single(struct device *dev, u64 dma_address, + dma_unmap_single(dev, dma_address, size, direction); + } + ++static int niu_pci_mapping_error(struct device *dev, u64 addr) ++{ ++ return dma_mapping_error(dev, addr); ++} ++ + static const struct niu_ops niu_pci_ops = { + .alloc_coherent = niu_pci_alloc_coherent, + .free_coherent = niu_pci_free_coherent, +@@ -9619,6 +9641,7 @@ static const struct niu_ops niu_pci_ops = { + .unmap_page = niu_pci_unmap_page, + .map_single = niu_pci_map_single, + .unmap_single = niu_pci_unmap_single, ++ .mapping_error = niu_pci_mapping_error, + }; + + static void niu_driver_version(void) +@@ -9985,6 +10008,11 @@ static void niu_phys_unmap_single(struct device *dev, u64 dma_address, + /* Nothing to do. */ + } + ++static int niu_phys_mapping_error(struct device *dev, u64 dma_address) ++{ ++ return false; ++} ++ + static const struct niu_ops niu_phys_ops = { + .alloc_coherent = niu_phys_alloc_coherent, + .free_coherent = niu_phys_free_coherent, +@@ -9992,6 +10020,7 @@ static const struct niu_ops niu_phys_ops = { + .unmap_page = niu_phys_unmap_page, + .map_single = niu_phys_map_single, + .unmap_single = niu_phys_unmap_single, ++ .mapping_error = niu_phys_mapping_error, + }; + + static int niu_of_probe(struct platform_device *op) +diff --git a/drivers/net/ethernet/sun/niu.h b/drivers/net/ethernet/sun/niu.h +index 04c215f91fc08..0b169c08b0f2d 100644 +--- a/drivers/net/ethernet/sun/niu.h ++++ b/drivers/net/ethernet/sun/niu.h +@@ -2879,6 +2879,9 @@ struct tx_ring_info { + #define NEXT_TX(tp, index) \ + (((index) + 1) < (tp)->pending ? ((index) + 1) : 0) + ++#define PREVIOUS_TX(tp, index) \ ++ (((index) - 1) >= 0 ? ((index) - 1) : (((tp)->pending) - 1)) ++ + static inline u32 niu_tx_avail(struct tx_ring_info *tp) + { + return (tp->pending - +@@ -3140,6 +3143,7 @@ struct niu_ops { + enum dma_data_direction direction); + void (*unmap_single)(struct device *dev, u64 dma_address, + size_t size, enum dma_data_direction direction); ++ int (*mapping_error)(struct device *dev, u64 dma_address); + }; + + struct niu_link_config { +-- +2.39.5 + diff --git a/queue-5.15/platform-mellanox-mlxbf-tmfifo-fix-vring_desc.len-as.patch b/queue-5.15/platform-mellanox-mlxbf-tmfifo-fix-vring_desc.len-as.patch new file mode 100644 index 0000000000..3f9a33d0d6 --- /dev/null +++ b/queue-5.15/platform-mellanox-mlxbf-tmfifo-fix-vring_desc.len-as.patch @@ -0,0 +1,46 @@ +From 2ab492181b096caa2ced4a33efc2c84e0591960d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Jun 2025 21:46:08 +0000 +Subject: platform/mellanox: mlxbf-tmfifo: fix vring_desc.len assignment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: David Thompson + +[ Upstream commit 109f4d29dade8ae5b4ac6325af9d1bc24b4230f8 ] + +Fix warnings reported by sparse, related to incorrect type: +drivers/platform/mellanox/mlxbf-tmfifo.c:284:38: warning: incorrect type in assignment (different base types) +drivers/platform/mellanox/mlxbf-tmfifo.c:284:38: expected restricted __virtio32 [usertype] len +drivers/platform/mellanox/mlxbf-tmfifo.c:284:38: got unsigned long + +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202404040339.S7CUIgf3-lkp@intel.com/ +Fixes: 78034cbece79 ("platform/mellanox: mlxbf-tmfifo: Drop the Rx packet if no more descriptors") +Signed-off-by: David Thompson +Link: https://lore.kernel.org/r/20250613214608.2250130-1-davthompson@nvidia.com +Reviewed-by: Ilpo Järvinen +Signed-off-by: Ilpo Järvinen +Signed-off-by: Sasha Levin +--- + drivers/platform/mellanox/mlxbf-tmfifo.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c +index 767f4406e55f1..1eb7f4eb1156c 100644 +--- a/drivers/platform/mellanox/mlxbf-tmfifo.c ++++ b/drivers/platform/mellanox/mlxbf-tmfifo.c +@@ -253,7 +253,8 @@ static int mlxbf_tmfifo_alloc_vrings(struct mlxbf_tmfifo *fifo, + vring->align = SMP_CACHE_BYTES; + vring->index = i; + vring->vdev_id = tm_vdev->vdev.id.device; +- vring->drop_desc.len = VRING_DROP_DESC_MAX_LEN; ++ vring->drop_desc.len = cpu_to_virtio32(&tm_vdev->vdev, ++ VRING_DROP_DESC_MAX_LEN); + dev = &tm_vdev->vdev.dev; + + size = vring_size(vring->num, vring->align); +-- +2.39.5 + diff --git a/queue-5.15/platform-x86-dell-wmi-sysman-fix-wmi-data-block-retr.patch b/queue-5.15/platform-x86-dell-wmi-sysman-fix-wmi-data-block-retr.patch new file mode 100644 index 0000000000..0bdfa0d6df --- /dev/null +++ b/queue-5.15/platform-x86-dell-wmi-sysman-fix-wmi-data-block-retr.patch @@ -0,0 +1,141 @@ +From baf9660cf4bcb2ad547b44c541e718246a4e0bb2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jun 2025 00:43:12 -0300 +Subject: platform/x86: dell-wmi-sysman: Fix WMI data block retrieval in sysfs + callbacks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Kurt Borja + +[ Upstream commit eb617dd25ca176f3fee24f873f0fd60010773d67 ] + +After retrieving WMI data blocks in sysfs callbacks, check for the +validity of them before dereferencing their content. + +Reported-by: Jan Graczyk +Closes: https://lore.kernel.org/r/CAHk-=wgMiSKXf7SvQrfEnxVtmT=QVQPjJdNjfm3aXS7wc=rzTw@mail.gmail.com/ +Fixes: e8a60aa7404b ("platform/x86: Introduce support for Systems Management Driver over WMI for Dell Systems") +Suggested-by: Linus Torvalds +Reviewed-by: Armin Wolf +Signed-off-by: Kurt Borja +Link: https://lore.kernel.org/r/20250630-sysman-fix-v2-1-d185674d0a30@gmail.com +Reviewed-by: Ilpo Järvinen +Signed-off-by: Ilpo Järvinen +Signed-off-by: Sasha Levin +--- + .../platform/x86/dell/dell-wmi-sysman/dell-wmi-sysman.h | 5 +++++ + .../platform/x86/dell/dell-wmi-sysman/enum-attributes.c | 5 +++-- + .../platform/x86/dell/dell-wmi-sysman/int-attributes.c | 5 +++-- + .../x86/dell/dell-wmi-sysman/passobj-attributes.c | 5 +++-- + .../platform/x86/dell/dell-wmi-sysman/string-attributes.c | 5 +++-- + drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 8 ++++---- + 6 files changed, 21 insertions(+), 12 deletions(-) + +diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/dell-wmi-sysman.h b/drivers/platform/x86/dell/dell-wmi-sysman/dell-wmi-sysman.h +index 3ad33a094588c..817ee7ba07ca0 100644 +--- a/drivers/platform/x86/dell/dell-wmi-sysman/dell-wmi-sysman.h ++++ b/drivers/platform/x86/dell/dell-wmi-sysman/dell-wmi-sysman.h +@@ -89,6 +89,11 @@ extern struct wmi_sysman_priv wmi_priv; + + enum { ENUM, INT, STR, PO }; + ++#define ENUM_MIN_ELEMENTS 8 ++#define INT_MIN_ELEMENTS 9 ++#define STR_MIN_ELEMENTS 8 ++#define PO_MIN_ELEMENTS 4 ++ + enum { + ATTR_NAME, + DISPL_NAME_LANG_CODE, +diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/enum-attributes.c b/drivers/platform/x86/dell/dell-wmi-sysman/enum-attributes.c +index 8cc212c852668..fc2f58b4cbc6e 100644 +--- a/drivers/platform/x86/dell/dell-wmi-sysman/enum-attributes.c ++++ b/drivers/platform/x86/dell/dell-wmi-sysman/enum-attributes.c +@@ -23,9 +23,10 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a + obj = get_wmiobj_pointer(instance_id, DELL_WMI_BIOS_ENUMERATION_ATTRIBUTE_GUID); + if (!obj) + return -EIO; +- if (obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_STRING) { ++ if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count < ENUM_MIN_ELEMENTS || ++ obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_STRING) { + kfree(obj); +- return -EINVAL; ++ return -EIO; + } + ret = snprintf(buf, PAGE_SIZE, "%s\n", obj->package.elements[CURRENT_VAL].string.pointer); + kfree(obj); +diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/int-attributes.c b/drivers/platform/x86/dell/dell-wmi-sysman/int-attributes.c +index 951e75b538fad..7352480642391 100644 +--- a/drivers/platform/x86/dell/dell-wmi-sysman/int-attributes.c ++++ b/drivers/platform/x86/dell/dell-wmi-sysman/int-attributes.c +@@ -25,9 +25,10 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a + obj = get_wmiobj_pointer(instance_id, DELL_WMI_BIOS_INTEGER_ATTRIBUTE_GUID); + if (!obj) + return -EIO; +- if (obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_INTEGER) { ++ if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count < INT_MIN_ELEMENTS || ++ obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_INTEGER) { + kfree(obj); +- return -EINVAL; ++ return -EIO; + } + ret = snprintf(buf, PAGE_SIZE, "%lld\n", obj->package.elements[CURRENT_VAL].integer.value); + kfree(obj); +diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/passobj-attributes.c b/drivers/platform/x86/dell/dell-wmi-sysman/passobj-attributes.c +index d8f1bf5e58a0f..3167e06d416ed 100644 +--- a/drivers/platform/x86/dell/dell-wmi-sysman/passobj-attributes.c ++++ b/drivers/platform/x86/dell/dell-wmi-sysman/passobj-attributes.c +@@ -26,9 +26,10 @@ static ssize_t is_enabled_show(struct kobject *kobj, struct kobj_attribute *attr + obj = get_wmiobj_pointer(instance_id, DELL_WMI_BIOS_PASSOBJ_ATTRIBUTE_GUID); + if (!obj) + return -EIO; +- if (obj->package.elements[IS_PASS_SET].type != ACPI_TYPE_INTEGER) { ++ if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count < PO_MIN_ELEMENTS || ++ obj->package.elements[IS_PASS_SET].type != ACPI_TYPE_INTEGER) { + kfree(obj); +- return -EINVAL; ++ return -EIO; + } + ret = snprintf(buf, PAGE_SIZE, "%lld\n", obj->package.elements[IS_PASS_SET].integer.value); + kfree(obj); +diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/string-attributes.c b/drivers/platform/x86/dell/dell-wmi-sysman/string-attributes.c +index c392f0ecf8b55..0d2c74f8d1aad 100644 +--- a/drivers/platform/x86/dell/dell-wmi-sysman/string-attributes.c ++++ b/drivers/platform/x86/dell/dell-wmi-sysman/string-attributes.c +@@ -25,9 +25,10 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a + obj = get_wmiobj_pointer(instance_id, DELL_WMI_BIOS_STRING_ATTRIBUTE_GUID); + if (!obj) + return -EIO; +- if (obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_STRING) { ++ if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count < STR_MIN_ELEMENTS || ++ obj->package.elements[CURRENT_VAL].type != ACPI_TYPE_STRING) { + kfree(obj); +- return -EINVAL; ++ return -EIO; + } + ret = snprintf(buf, PAGE_SIZE, "%s\n", obj->package.elements[CURRENT_VAL].string.pointer); + kfree(obj); +diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c +index 47f8c5a63343d..ab639dc8a8072 100644 +--- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c ++++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c +@@ -411,10 +411,10 @@ static int init_bios_attributes(int attr_type, const char *guid) + return retval; + + switch (attr_type) { +- case ENUM: min_elements = 8; break; +- case INT: min_elements = 9; break; +- case STR: min_elements = 8; break; +- case PO: min_elements = 4; break; ++ case ENUM: min_elements = ENUM_MIN_ELEMENTS; break; ++ case INT: min_elements = INT_MIN_ELEMENTS; break; ++ case STR: min_elements = STR_MIN_ELEMENTS; break; ++ case PO: min_elements = PO_MIN_ELEMENTS; break; + default: + pr_err("Error: Unknown attr_type: %d\n", attr_type); + return -EINVAL; +-- +2.39.5 + diff --git a/queue-5.15/powerpc-fix-struct-termio-related-ioctl-macros.patch b/queue-5.15/powerpc-fix-struct-termio-related-ioctl-macros.patch new file mode 100644 index 0000000000..a5a1ae9899 --- /dev/null +++ b/queue-5.15/powerpc-fix-struct-termio-related-ioctl-macros.patch @@ -0,0 +1,58 @@ +From 6318a6a99d6faff27790da767489eb824e7273f5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 17 May 2025 19:52:37 +0530 +Subject: powerpc: Fix struct termio related ioctl macros + +From: Madhavan Srinivasan + +[ Upstream commit ab107276607af90b13a5994997e19b7b9731e251 ] + +Since termio interface is now obsolete, include/uapi/asm/ioctls.h +has some constant macros referring to "struct termio", this caused +build failure at userspace. + +In file included from /usr/include/asm/ioctl.h:12, + from /usr/include/asm/ioctls.h:5, + from tst-ioctls.c:3: +tst-ioctls.c: In function 'get_TCGETA': +tst-ioctls.c:12:10: error: invalid application of 'sizeof' to incomplete type 'struct termio' + 12 | return TCGETA; + | ^~~~~~ + +Even though termios.h provides "struct termio", trying to juggle definitions around to +make it compile could introduce regressions. So better to open code it. + +Reported-by: Tulio Magno +Suggested-by: Nicholas Piggin +Tested-by: Justin M. Forbes +Reviewed-by: Michael Ellerman +Closes: https://lore.kernel.org/linuxppc-dev/8734dji5wl.fsf@ascii.art.br/ +Signed-off-by: Madhavan Srinivasan +Link: https://patch.msgid.link/20250517142237.156665-1-maddy@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/uapi/asm/ioctls.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/powerpc/include/uapi/asm/ioctls.h b/arch/powerpc/include/uapi/asm/ioctls.h +index 2c145da3b774a..b5211e413829a 100644 +--- a/arch/powerpc/include/uapi/asm/ioctls.h ++++ b/arch/powerpc/include/uapi/asm/ioctls.h +@@ -23,10 +23,10 @@ + #define TCSETSW _IOW('t', 21, struct termios) + #define TCSETSF _IOW('t', 22, struct termios) + +-#define TCGETA _IOR('t', 23, struct termio) +-#define TCSETA _IOW('t', 24, struct termio) +-#define TCSETAW _IOW('t', 25, struct termio) +-#define TCSETAF _IOW('t', 28, struct termio) ++#define TCGETA 0x40147417 /* _IOR('t', 23, struct termio) */ ++#define TCSETA 0x80147418 /* _IOW('t', 24, struct termio) */ ++#define TCSETAW 0x80147419 /* _IOW('t', 25, struct termio) */ ++#define TCSETAF 0x8014741c /* _IOW('t', 28, struct termio) */ + + #define TCSBRK _IO('t', 29) + #define TCXONC _IO('t', 30) +-- +2.39.5 + diff --git a/queue-5.15/rcu-return-early-if-callback-is-not-specified.patch b/queue-5.15/rcu-return-early-if-callback-is-not-specified.patch new file mode 100644 index 0000000000..acffb312c9 --- /dev/null +++ b/queue-5.15/rcu-return-early-if-callback-is-not-specified.patch @@ -0,0 +1,43 @@ +From 860f37326324a4cfc09cc0902559f5f735cbba2e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 19:34:48 +0200 +Subject: rcu: Return early if callback is not specified + +From: Uladzislau Rezki (Sony) + +[ Upstream commit 33b6a1f155d627f5bd80c7485c598ce45428f74f ] + +Currently the call_rcu() API does not check whether a callback +pointer is NULL. If NULL is passed, rcu_core() will try to invoke +it, resulting in NULL pointer dereference and a kernel crash. + +To prevent this and improve debuggability, this patch adds a check +for NULL and emits a kernel stack trace to help identify a faulty +caller. + +Signed-off-by: Uladzislau Rezki (Sony) +Reviewed-by: Joel Fernandes +Signed-off-by: Joel Fernandes +Signed-off-by: Sasha Levin +--- + kernel/rcu/tree.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c +index 66c1ca01dd0e9..185d37b02dc9c 100644 +--- a/kernel/rcu/tree.c ++++ b/kernel/rcu/tree.c +@@ -2988,6 +2988,10 @@ __call_rcu(struct rcu_head *head, rcu_callback_t func) + /* Misaligned rcu_head! */ + WARN_ON_ONCE((unsigned long)head & (sizeof(void *) - 1)); + ++ /* Avoid NULL dereference if callback is NULL. */ ++ if (WARN_ON_ONCE(!func)) ++ return; ++ + if (debug_rcu_head_queue(head)) { + /* + * Probable double call_rcu(), so leak the callback. +-- +2.39.5 + diff --git a/queue-5.15/rdma-mlx5-fix-cc-counters-query-for-mpv.patch b/queue-5.15/rdma-mlx5-fix-cc-counters-query-for-mpv.patch new file mode 100644 index 0000000000..4d63c8d025 --- /dev/null +++ b/queue-5.15/rdma-mlx5-fix-cc-counters-query-for-mpv.patch @@ -0,0 +1,38 @@ +From e1f936f24356b9e2e09237104ef3c964d2734ce8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 16 Jun 2025 12:14:53 +0300 +Subject: RDMA/mlx5: Fix CC counters query for MPV + +From: Patrisious Haddad + +[ Upstream commit acd245b1e33fc4b9d0f2e3372021d632f7ee0652 ] + +In case, CC counters are querying for the second port use the correct +core device for the query instead of always using the master core device. + +Fixes: aac4492ef23a ("IB/mlx5: Update counter implementation for dual port RoCE") +Signed-off-by: Patrisious Haddad +Reviewed-by: Michael Guralnik +Link: https://patch.msgid.link/9cace74dcf106116118bebfa9146d40d4166c6b0.1750064969.git.leon@kernel.org +Signed-off-by: Leon Romanovsky +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/mlx5/counters.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/infiniband/hw/mlx5/counters.c b/drivers/infiniband/hw/mlx5/counters.c +index 870a089198116..79225f21a2837 100644 +--- a/drivers/infiniband/hw/mlx5/counters.c ++++ b/drivers/infiniband/hw/mlx5/counters.c +@@ -279,7 +279,7 @@ static int mlx5_ib_get_hw_stats(struct ib_device *ibdev, + */ + goto done; + } +- ret = mlx5_lag_query_cong_counters(dev->mdev, ++ ret = mlx5_lag_query_cong_counters(mdev, + stats->value + + cnts->num_q_counters, + cnts->num_cong_counters, +-- +2.39.5 + diff --git a/queue-5.15/rdma-mlx5-initialize-obj_event-obj_sub_list-before-x.patch b/queue-5.15/rdma-mlx5-initialize-obj_event-obj_sub_list-before-x.patch new file mode 100644 index 0000000000..0f67d30717 --- /dev/null +++ b/queue-5.15/rdma-mlx5-initialize-obj_event-obj_sub_list-before-x.patch @@ -0,0 +1,100 @@ +From b0e7f191abf749c2f7110929390721fece855f82 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Jun 2025 11:13:55 +0300 +Subject: RDMA/mlx5: Initialize obj_event->obj_sub_list before xa_insert + +From: Mark Zhang + +[ Upstream commit 8edab8a72d67742f87e9dc2e2b0cdfddda5dc29a ] + +The obj_event may be loaded immediately after inserted, then if the +list_head is not initialized then we may get a poisonous pointer. This +fixes the crash below: + + mlx5_core 0000:03:00.0: MLX5E: StrdRq(1) RqSz(8) StrdSz(2048) RxCqeCmprss(0 enhanced) + mlx5_core.sf mlx5_core.sf.4: firmware version: 32.38.3056 + mlx5_core 0000:03:00.0 en3f0pf0sf2002: renamed from eth0 + mlx5_core.sf mlx5_core.sf.4: Rate limit: 127 rates are supported, range: 0Mbps to 195312Mbps + IPv6: ADDRCONF(NETDEV_CHANGE): en3f0pf0sf2002: link becomes ready + Unable to handle kernel NULL pointer dereference at virtual address 0000000000000060 + Mem abort info: + ESR = 0x96000006 + EC = 0x25: DABT (current EL), IL = 32 bits + SET = 0, FnV = 0 + EA = 0, S1PTW = 0 + Data abort info: + ISV = 0, ISS = 0x00000006 + CM = 0, WnR = 0 + user pgtable: 4k pages, 48-bit VAs, pgdp=00000007760fb000 + [0000000000000060] pgd=000000076f6d7003, p4d=000000076f6d7003, pud=0000000777841003, pmd=0000000000000000 + Internal error: Oops: 96000006 [#1] SMP + Modules linked in: ipmb_host(OE) act_mirred(E) cls_flower(E) sch_ingress(E) mptcp_diag(E) udp_diag(E) raw_diag(E) unix_diag(E) tcp_diag(E) inet_diag(E) binfmt_misc(E) bonding(OE) rdma_ucm(OE) rdma_cm(OE) iw_cm(OE) ib_ipoib(OE) ib_cm(OE) isofs(E) cdrom(E) mst_pciconf(OE) ib_umad(OE) mlx5_ib(OE) ipmb_dev_int(OE) mlx5_core(OE) kpatch_15237886(OEK) mlxdevm(OE) auxiliary(OE) ib_uverbs(OE) ib_core(OE) psample(E) mlxfw(OE) tls(E) sunrpc(E) vfat(E) fat(E) crct10dif_ce(E) ghash_ce(E) sha1_ce(E) sbsa_gwdt(E) virtio_console(E) ext4(E) mbcache(E) jbd2(E) xfs(E) libcrc32c(E) mmc_block(E) virtio_net(E) net_failover(E) failover(E) sha2_ce(E) sha256_arm64(E) nvme(OE) nvme_core(OE) gpio_mlxbf3(OE) mlx_compat(OE) mlxbf_pmc(OE) i2c_mlxbf(OE) sdhci_of_dwcmshc(OE) pinctrl_mlxbf3(OE) mlxbf_pka(OE) gpio_generic(E) i2c_core(E) mmc_core(E) mlxbf_gige(OE) vitesse(E) pwr_mlxbf(OE) mlxbf_tmfifo(OE) micrel(E) mlxbf_bootctl(OE) virtio_ring(E) virtio(E) ipmi_devintf(E) ipmi_msghandler(E) + [last unloaded: mst_pci] + CPU: 11 PID: 20913 Comm: rte-worker-11 Kdump: loaded Tainted: G OE K 5.10.134-13.1.an8.aarch64 #1 + Hardware name: https://www.mellanox.com BlueField-3 SmartNIC Main Card/BlueField-3 SmartNIC Main Card, BIOS 4.2.2.12968 Oct 26 2023 + pstate: a0400089 (NzCv daIf +PAN -UAO -TCO BTYPE=--) + pc : dispatch_event_fd+0x68/0x300 [mlx5_ib] + lr : devx_event_notifier+0xcc/0x228 [mlx5_ib] + sp : ffff80001005bcf0 + x29: ffff80001005bcf0 x28: 0000000000000001 + x27: ffff244e0740a1d8 x26: ffff244e0740a1d0 + x25: ffffda56beff5ae0 x24: ffffda56bf911618 + x23: ffff244e0596a480 x22: ffff244e0596a480 + x21: ffff244d8312ad90 x20: ffff244e0596a480 + x19: fffffffffffffff0 x18: 0000000000000000 + x17: 0000000000000000 x16: ffffda56be66d620 + x15: 0000000000000000 x14: 0000000000000000 + x13: 0000000000000000 x12: 0000000000000000 + x11: 0000000000000040 x10: ffffda56bfcafb50 + x9 : ffffda5655c25f2c x8 : 0000000000000010 + x7 : 0000000000000000 x6 : ffff24545a2e24b8 + x5 : 0000000000000003 x4 : ffff80001005bd28 + x3 : 0000000000000000 x2 : 0000000000000000 + x1 : ffff244e0596a480 x0 : ffff244d8312ad90 + Call trace: + dispatch_event_fd+0x68/0x300 [mlx5_ib] + devx_event_notifier+0xcc/0x228 [mlx5_ib] + atomic_notifier_call_chain+0x58/0x80 + mlx5_eq_async_int+0x148/0x2b0 [mlx5_core] + atomic_notifier_call_chain+0x58/0x80 + irq_int_handler+0x20/0x30 [mlx5_core] + __handle_irq_event_percpu+0x60/0x220 + handle_irq_event_percpu+0x3c/0x90 + handle_irq_event+0x58/0x158 + handle_fasteoi_irq+0xfc/0x188 + generic_handle_irq+0x34/0x48 + ... + +Fixes: 759738537142 ("IB/mlx5: Enable subscription for device events over DEVX") +Link: https://patch.msgid.link/r/3ce7f20e0d1a03dc7de6e57494ec4b8eaf1f05c2.1750147949.git.leon@kernel.org +Signed-off-by: Mark Zhang +Signed-off-by: Leon Romanovsky +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/mlx5/devx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c +index 55e2873351240..cc351390b568c 100644 +--- a/drivers/infiniband/hw/mlx5/devx.c ++++ b/drivers/infiniband/hw/mlx5/devx.c +@@ -1907,6 +1907,7 @@ subscribe_event_xa_alloc(struct mlx5_devx_event_table *devx_event_table, + /* Level1 is valid for future use, no need to free */ + return -ENOMEM; + ++ INIT_LIST_HEAD(&obj_event->obj_sub_list); + err = xa_insert(&event->object_ids, + key_level2, + obj_event, +@@ -1915,7 +1916,6 @@ subscribe_event_xa_alloc(struct mlx5_devx_event_table *devx_event_table, + kfree(obj_event); + return err; + } +- INIT_LIST_HEAD(&obj_event->obj_sub_list); + } + + return 0; +-- +2.39.5 + diff --git a/queue-5.15/rose-fix-dangling-neighbour-pointers-in-rose_rt_devi.patch b/queue-5.15/rose-fix-dangling-neighbour-pointers-in-rose_rt_devi.patch new file mode 100644 index 0000000000..2742260c4e --- /dev/null +++ b/queue-5.15/rose-fix-dangling-neighbour-pointers-in-rose_rt_devi.patch @@ -0,0 +1,84 @@ +From bd516501a560edf69443959d83892768cc5972db Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 29 Jun 2025 12:06:31 +0900 +Subject: rose: fix dangling neighbour pointers in rose_rt_device_down() + +From: Kohei Enju + +[ Upstream commit 34a500caf48c47d5171f4aa1f237da39b07c6157 ] + +There are two bugs in rose_rt_device_down() that can cause +use-after-free: + +1. The loop bound `t->count` is modified within the loop, which can + cause the loop to terminate early and miss some entries. + +2. When removing an entry from the neighbour array, the subsequent entries + are moved up to fill the gap, but the loop index `i` is still + incremented, causing the next entry to be skipped. + +For example, if a node has three neighbours (A, A, B) with count=3 and A +is being removed, the second A is not checked. + + i=0: (A, A, B) -> (A, B) with count=2 + ^ checked + i=1: (A, B) -> (A, B) with count=2 + ^ checked (B, not A!) + i=2: (doesn't occur because i < count is false) + +This leaves the second A in the array with count=2, but the rose_neigh +structure has been freed. Code that accesses these entries assumes that +the first `count` entries are valid pointers, causing a use-after-free +when it accesses the dangling pointer. + +Fix both issues by iterating over the array in reverse order with a fixed +loop bound. This ensures that all entries are examined and that the removal +of an entry doesn't affect subsequent iterations. + +Reported-by: syzbot+e04e2c007ba2c80476cb@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=e04e2c007ba2c80476cb +Tested-by: syzbot+e04e2c007ba2c80476cb@syzkaller.appspotmail.com +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kohei Enju +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20250629030833.6680-1-enjuk@amazon.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/rose/rose_route.c | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) + +diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c +index 66aa05db5390f..d0112f1863850 100644 +--- a/net/rose/rose_route.c ++++ b/net/rose/rose_route.c +@@ -497,22 +497,15 @@ void rose_rt_device_down(struct net_device *dev) + t = rose_node; + rose_node = rose_node->next; + +- for (i = 0; i < t->count; i++) { ++ for (i = t->count - 1; i >= 0; i--) { + if (t->neighbour[i] != s) + continue; + + t->count--; + +- switch (i) { +- case 0: +- t->neighbour[0] = t->neighbour[1]; +- fallthrough; +- case 1: +- t->neighbour[1] = t->neighbour[2]; +- break; +- case 2: +- break; +- } ++ memmove(&t->neighbour[i], &t->neighbour[i + 1], ++ sizeof(t->neighbour[0]) * ++ (t->count - i)); + } + + if (t->count <= 0) +-- +2.39.5 + diff --git a/queue-5.15/scsi-qla2xxx-fix-dma-mapping-test-in-qla24xx_get_por.patch b/queue-5.15/scsi-qla2xxx-fix-dma-mapping-test-in-qla24xx_get_por.patch new file mode 100644 index 0000000000..2eeb5cfd63 --- /dev/null +++ b/queue-5.15/scsi-qla2xxx-fix-dma-mapping-test-in-qla24xx_get_por.patch @@ -0,0 +1,38 @@ +From af7d9f43e87f351fcf8be4b7b0010dac5a072878 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Jun 2025 18:11:11 +0200 +Subject: scsi: qla2xxx: Fix DMA mapping test in qla24xx_get_port_database() + +From: Thomas Fourier + +[ Upstream commit c3b214719a87735d4f67333a8ef3c0e31a34837c ] + +dma_map_XXX() functions return as error values DMA_MAPPING_ERROR which is +often ~0. The error value should be tested with dma_mapping_error() like +it was done in qla26xx_dport_diagnostics(). + +Fixes: 818c7f87a177 ("scsi: qla2xxx: Add changes in preparation for vendor extended FDMI/RDP") +Signed-off-by: Thomas Fourier +Link: https://lore.kernel.org/r/20250617161115.39888-2-fourier.thomas@gmail.com +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/qla2xxx/qla_mbx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c +index d2ff54beb7cd7..7a28582b1f73a 100644 +--- a/drivers/scsi/qla2xxx/qla_mbx.c ++++ b/drivers/scsi/qla2xxx/qla_mbx.c +@@ -2141,7 +2141,7 @@ qla24xx_get_port_database(scsi_qla_host_t *vha, u16 nport_handle, + + pdb_dma = dma_map_single(&vha->hw->pdev->dev, pdb, + sizeof(*pdb), DMA_FROM_DEVICE); +- if (!pdb_dma) { ++ if (dma_mapping_error(&vha->hw->pdev->dev, pdb_dma)) { + ql_log(ql_log_warn, vha, 0x1116, "Failed to map dma buffer.\n"); + return QLA_MEMORY_ALLOC_FAILED; + } +-- +2.39.5 + diff --git a/queue-5.15/scsi-qla4xxx-fix-missing-dma-mapping-error-in-qla4xx.patch b/queue-5.15/scsi-qla4xxx-fix-missing-dma-mapping-error-in-qla4xx.patch new file mode 100644 index 0000000000..2c6d523046 --- /dev/null +++ b/queue-5.15/scsi-qla4xxx-fix-missing-dma-mapping-error-in-qla4xx.patch @@ -0,0 +1,37 @@ +From 6c9ecb7c5cbe3acf4ef1c8199468a4135196805f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Jun 2025 09:17:37 +0200 +Subject: scsi: qla4xxx: Fix missing DMA mapping error in qla4xxx_alloc_pdu() + +From: Thomas Fourier + +[ Upstream commit 00f452a1b084efbe8dcb60a29860527944a002a1 ] + +dma_map_XXX() can fail and should be tested for errors with +dma_mapping_error(). + +Fixes: b3a271a94d00 ("[SCSI] qla4xxx: support iscsiadm session mgmt") +Signed-off-by: Thomas Fourier +Link: https://lore.kernel.org/r/20250618071742.21822-2-fourier.thomas@gmail.com +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/qla4xxx/ql4_os.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c +index dc466a364fb1f..ab89f3171a093 100644 +--- a/drivers/scsi/qla4xxx/ql4_os.c ++++ b/drivers/scsi/qla4xxx/ql4_os.c +@@ -3420,6 +3420,8 @@ static int qla4xxx_alloc_pdu(struct iscsi_task *task, uint8_t opcode) + task_data->data_dma = dma_map_single(&ha->pdev->dev, task->data, + task->data_count, + DMA_TO_DEVICE); ++ if (dma_mapping_error(&ha->pdev->dev, task_data->data_dma)) ++ return -ENOMEM; + } + + DEBUG2(ql4_printk(KERN_INFO, ha, "%s: MaxRecvLen %u, iscsi hrd %d\n", +-- +2.39.5 + diff --git a/queue-5.15/scsi-target-fix-null-pointer-dereference-in-core_scs.patch b/queue-5.15/scsi-target-fix-null-pointer-dereference-in-core_scs.patch new file mode 100644 index 0000000000..89c5c64bdd --- /dev/null +++ b/queue-5.15/scsi-target-fix-null-pointer-dereference-in-core_scs.patch @@ -0,0 +1,56 @@ +From 62edb50bebff3231e96c1aeaaff0f91386bbd026 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 12 Jun 2025 12:15:56 +0200 +Subject: scsi: target: Fix NULL pointer dereference in + core_scsi3_decode_spec_i_port() + +From: Maurizio Lombardi + +[ Upstream commit d8ab68bdb294b09a761e967dad374f2965e1913f ] + +The function core_scsi3_decode_spec_i_port(), in its error code path, +unconditionally calls core_scsi3_lunacl_undepend_item() passing the +dest_se_deve pointer, which may be NULL. + +This can lead to a NULL pointer dereference if dest_se_deve remains +unset. + +SPC-3 PR SPEC_I_PT: Unable to locate dest_tpg +Unable to handle kernel paging request at virtual address dfff800000000012 +Call trace: + core_scsi3_lunacl_undepend_item+0x2c/0xf0 [target_core_mod] (P) + core_scsi3_decode_spec_i_port+0x120c/0x1c30 [target_core_mod] + core_scsi3_emulate_pro_register+0x6b8/0xcd8 [target_core_mod] + target_scsi3_emulate_pr_out+0x56c/0x840 [target_core_mod] + +Fix this by adding a NULL check before calling +core_scsi3_lunacl_undepend_item() + +Signed-off-by: Maurizio Lombardi +Link: https://lore.kernel.org/r/20250612101556.24829-1-mlombard@redhat.com +Reviewed-by: Mike Christie +Reviewed-by: John Meneghini +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/target/target_core_pr.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c +index 3829b61b56c12..f4a797d3c5734 100644 +--- a/drivers/target/target_core_pr.c ++++ b/drivers/target/target_core_pr.c +@@ -1852,7 +1852,9 @@ core_scsi3_decode_spec_i_port( + } + + kmem_cache_free(t10_pr_reg_cache, dest_pr_reg); +- core_scsi3_lunacl_undepend_item(dest_se_deve); ++ ++ if (dest_se_deve) ++ core_scsi3_lunacl_undepend_item(dest_se_deve); + + if (is_local) + continue; +-- +2.39.5 + diff --git a/queue-5.15/scsi-ufs-core-fix-spelling-of-a-sysfs-attribute-name.patch b/queue-5.15/scsi-ufs-core-fix-spelling-of-a-sysfs-attribute-name.patch new file mode 100644 index 0000000000..d76e455ad5 --- /dev/null +++ b/queue-5.15/scsi-ufs-core-fix-spelling-of-a-sysfs-attribute-name.patch @@ -0,0 +1,60 @@ +From 6cd6fa872e9772b7aa00e07164235db69db6e897 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 24 Jun 2025 11:16:44 -0700 +Subject: scsi: ufs: core: Fix spelling of a sysfs attribute name + +From: Bart Van Assche + +[ Upstream commit 021f243627ead17eb6500170256d3d9be787dad8 ] + +Change "resourse" into "resource" in the name of a sysfs attribute. + +Fixes: d829fc8a1058 ("scsi: ufs: sysfs: unit descriptor") +Signed-off-by: Bart Van Assche +Link: https://lore.kernel.org/r/20250624181658.336035-1-bvanassche@acm.org +Reviewed-by: Avri Altman +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + Documentation/ABI/testing/sysfs-driver-ufs | 2 +- + drivers/scsi/ufs/ufs-sysfs.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Documentation/ABI/testing/sysfs-driver-ufs b/Documentation/ABI/testing/sysfs-driver-ufs +index ec3a7149ced59..2e2e0b992233d 100644 +--- a/Documentation/ABI/testing/sysfs-driver-ufs ++++ b/Documentation/ABI/testing/sysfs-driver-ufs +@@ -655,7 +655,7 @@ Description: This file shows the thin provisioning type. This is one of + + The file is read only. + +-What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resourse_count ++What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resource_count + Date: February 2018 + Contact: Stanislav Nijnikov + Description: This file shows the total physical memory resources. This is +diff --git a/drivers/scsi/ufs/ufs-sysfs.c b/drivers/scsi/ufs/ufs-sysfs.c +index 3bfdcc2f22dc0..369595dbb1fcd 100644 +--- a/drivers/scsi/ufs/ufs-sysfs.c ++++ b/drivers/scsi/ufs/ufs-sysfs.c +@@ -1180,7 +1180,7 @@ UFS_UNIT_DESC_PARAM(logical_block_size, _LOGICAL_BLK_SIZE, 1); + UFS_UNIT_DESC_PARAM(logical_block_count, _LOGICAL_BLK_COUNT, 8); + UFS_UNIT_DESC_PARAM(erase_block_size, _ERASE_BLK_SIZE, 4); + UFS_UNIT_DESC_PARAM(provisioning_type, _PROVISIONING_TYPE, 1); +-UFS_UNIT_DESC_PARAM(physical_memory_resourse_count, _PHY_MEM_RSRC_CNT, 8); ++UFS_UNIT_DESC_PARAM(physical_memory_resource_count, _PHY_MEM_RSRC_CNT, 8); + UFS_UNIT_DESC_PARAM(context_capabilities, _CTX_CAPABILITIES, 2); + UFS_UNIT_DESC_PARAM(large_unit_granularity, _LARGE_UNIT_SIZE_M1, 1); + UFS_UNIT_DESC_PARAM(hpb_lu_max_active_regions, _HPB_LU_MAX_ACTIVE_RGNS, 2); +@@ -1200,7 +1200,7 @@ static struct attribute *ufs_sysfs_unit_descriptor[] = { + &dev_attr_logical_block_count.attr, + &dev_attr_erase_block_size.attr, + &dev_attr_provisioning_type.attr, +- &dev_attr_physical_memory_resourse_count.attr, ++ &dev_attr_physical_memory_resource_count.attr, + &dev_attr_context_capabilities.attr, + &dev_attr_large_unit_granularity.attr, + &dev_attr_hpb_lu_max_active_regions.attr, +-- +2.39.5 + diff --git a/queue-5.15/series b/queue-5.15/series index 63cda51ce8..8008a6d48f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -102,3 +102,35 @@ usb-typec-altmodes-displayport-do-not-index-invalid-pin_assignments.patch mtk-sd-fix-a-pagefault-in-dma_unmap_sg-for-not-prepared-data.patch mtk-sd-prevent-memory-corruption-from-dma-map-failure.patch mtk-sd-reset-host-mrq-on-prepare_data-error.patch +platform-mellanox-mlxbf-tmfifo-fix-vring_desc.len-as.patch +rdma-mlx5-initialize-obj_event-obj_sub_list-before-x.patch +nfs-clean-up-proc-net-rpc-nfs-when-nfs_fs_proc_net_i.patch +nfsv4-pnfs-fix-a-race-to-wake-on-nfs_layout_drain.patch +scsi-qla2xxx-fix-dma-mapping-test-in-qla24xx_get_por.patch +scsi-qla4xxx-fix-missing-dma-mapping-error-in-qla4xx.patch +scsi-ufs-core-fix-spelling-of-a-sysfs-attribute-name.patch +rdma-mlx5-fix-cc-counters-query-for-mpv.patch +btrfs-fix-missing-error-handling-when-searching-for-.patch +drm-exynos-fimd-guard-display-clock-control-with-run.patch +spi-spi-fsl-dspi-clear-completion-counter-before-ini.patch +drm-i915-selftests-change-mock_request-to-return-err.patch +platform-x86-dell-wmi-sysman-fix-wmi-data-block-retr.patch +drm-i915-gt-fix-timeline-left-held-on-vma-alloc-erro.patch +igc-disable-l1.2-pci-e-link-substate-to-avoid-perfor.patch +lib-test_objagg-set-error-message-in-check_expect_hi.patch +amd-xgbe-align-cl37-an-sequence-as-per-databook.patch +enic-fix-incorrect-mtu-comparison-in-enic_change_mtu.patch +rose-fix-dangling-neighbour-pointers-in-rose_rt_devi.patch +nui-fix-dma_mapping_error-check.patch +net-sched-always-pass-notifications-when-child-class.patch +drm-msm-fix-a-fence-leak-in-submit-error-path.patch +alsa-sb-don-t-allow-changing-the-dma-mode-during-ope.patch +alsa-sb-force-to-disable-dmas-once-when-dma-mode-is-.patch +ata-pata_cs5536-fix-build-on-32-bit-uml.patch +powerpc-fix-struct-termio-related-ioctl-macros.patch +scsi-target-fix-null-pointer-dereference-in-core_scs.patch +wifi-mac80211-drop-invalid-source-address-ocb-frames.patch +wifi-ath6kl-remove-warn-on-bad-firmware-input.patch +acpica-refuse-to-evaluate-a-method-if-arguments-are-.patch +mtd-spinand-fix-memory-leak-of-ecc-engine-conf.patch +rcu-return-early-if-callback-is-not-specified.patch diff --git a/queue-5.15/spi-spi-fsl-dspi-clear-completion-counter-before-ini.patch b/queue-5.15/spi-spi-fsl-dspi-clear-completion-counter-before-ini.patch new file mode 100644 index 0000000000..bda43396f4 --- /dev/null +++ b/queue-5.15/spi-spi-fsl-dspi-clear-completion-counter-before-ini.patch @@ -0,0 +1,61 @@ +From dadefd43c8ddf96e04b7bba58dd3fd69816686d0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 27 Jun 2025 11:21:37 +0100 +Subject: spi: spi-fsl-dspi: Clear completion counter before initiating + transfer + +From: James Clark + +[ Upstream commit fa60c094c19b97e103d653f528f8d9c178b6a5f5 ] + +In target mode, extra interrupts can be received between the end of a +transfer and halting the module if the host continues sending more data. +If the interrupt from this occurs after the reinit_completion() then the +completion counter is left at a non-zero value. The next unrelated +transfer initiated by userspace will then complete immediately without +waiting for the interrupt or writing to the RX buffer. + +Fix it by resetting the counter before the transfer so that lingering +values are cleared. This is done after clearing the FIFOs and the +status register but before the transfer is initiated, so no interrupts +should be received at this point resulting in other race conditions. + +Fixes: 4f5ee75ea171 ("spi: spi-fsl-dspi: Replace interruptible wait queue with a simple completion") +Signed-off-by: James Clark +Reviewed-by: Frank Li +Link: https://patch.msgid.link/20250627-james-nxp-spi-dma-v4-1-178dba20c120@linaro.org +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-fsl-dspi.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c +index eda7ed618369d..580fdcbcd9b6c 100644 +--- a/drivers/spi/spi-fsl-dspi.c ++++ b/drivers/spi/spi-fsl-dspi.c +@@ -964,11 +964,20 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr, + if (dspi->devtype_data->trans_mode == DSPI_DMA_MODE) { + status = dspi_dma_xfer(dspi); + } else { ++ /* ++ * Reinitialize the completion before transferring data ++ * to avoid the case where it might remain in the done ++ * state due to a spurious interrupt from a previous ++ * transfer. This could falsely signal that the current ++ * transfer has completed. ++ */ ++ if (dspi->irq) ++ reinit_completion(&dspi->xfer_done); ++ + dspi_fifo_write(dspi); + + if (dspi->irq) { + wait_for_completion(&dspi->xfer_done); +- reinit_completion(&dspi->xfer_done); + } else { + do { + status = dspi_poll(dspi); +-- +2.39.5 + diff --git a/queue-5.15/wifi-ath6kl-remove-warn-on-bad-firmware-input.patch b/queue-5.15/wifi-ath6kl-remove-warn-on-bad-firmware-input.patch new file mode 100644 index 0000000000..6a37e1b651 --- /dev/null +++ b/queue-5.15/wifi-ath6kl-remove-warn-on-bad-firmware-input.patch @@ -0,0 +1,43 @@ +From 69f05b43eaf059800a91bb6848d5ae64755f30f7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Jun 2025 11:45:29 +0200 +Subject: wifi: ath6kl: remove WARN on bad firmware input + +From: Johannes Berg + +[ Upstream commit e7417421d89358da071fd2930f91e67c7128fbff ] + +If the firmware gives bad input, that's nothing to do with +the driver's stack at this point etc., so the WARN_ON() +doesn't add any value. Additionally, this is one of the +top syzbot reports now. Just print a message, and as an +added bonus, print the sizes too. + +Reported-by: syzbot+92c6dd14aaa230be6855@syzkaller.appspotmail.com +Tested-by: syzbot+92c6dd14aaa230be6855@syzkaller.appspotmail.com +Acked-by: Jeff Johnson +Link: https://patch.msgid.link/20250617114529.031a677a348e.I58bf1eb4ac16a82c546725ff010f3f0d2b0cca49@changeid +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath6kl/bmi.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/ath/ath6kl/bmi.c b/drivers/net/wireless/ath/ath6kl/bmi.c +index af98e871199d3..5a9e93fd1ef42 100644 +--- a/drivers/net/wireless/ath/ath6kl/bmi.c ++++ b/drivers/net/wireless/ath/ath6kl/bmi.c +@@ -87,7 +87,9 @@ int ath6kl_bmi_get_target_info(struct ath6kl *ar, + * We need to do some backwards compatibility to make this work. + */ + if (le32_to_cpu(targ_info->byte_count) != sizeof(*targ_info)) { +- WARN_ON(1); ++ ath6kl_err("mismatched byte count %d vs. expected %zd\n", ++ le32_to_cpu(targ_info->byte_count), ++ sizeof(*targ_info)); + return -EINVAL; + } + +-- +2.39.5 + diff --git a/queue-5.15/wifi-mac80211-drop-invalid-source-address-ocb-frames.patch b/queue-5.15/wifi-mac80211-drop-invalid-source-address-ocb-frames.patch new file mode 100644 index 0000000000..e94c4cdc97 --- /dev/null +++ b/queue-5.15/wifi-mac80211-drop-invalid-source-address-ocb-frames.patch @@ -0,0 +1,42 @@ +From d5a08c5a9bbb9a0c2e29c1ed47969596f2368075 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 16 Jun 2025 17:18:38 +0200 +Subject: wifi: mac80211: drop invalid source address OCB frames + +From: Johannes Berg + +[ Upstream commit d1b1a5eb27c4948e8811cf4dbb05aaf3eb10700c ] + +In OCB, don't accept frames from invalid source addresses +(and in particular don't try to create stations for them), +drop the frames instead. + +Reported-by: syzbot+8b512026a7ec10dcbdd9@syzkaller.appspotmail.com +Closes: https://lore.kernel.org/r/6788d2d9.050a0220.20d369.0028.GAE@google.com/ +Signed-off-by: Johannes Berg +Tested-by: syzbot+8b512026a7ec10dcbdd9@syzkaller.appspotmail.com +Link: https://patch.msgid.link/20250616171838.7433379cab5d.I47444d63c72a0bd58d2e2b67bb99e1fea37eec6f@changeid +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/rx.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c +index 26943c93f14c4..6c160ff2aab90 100644 +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -4168,6 +4168,10 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx) + if (!multicast && + !ether_addr_equal(sdata->dev->dev_addr, hdr->addr1)) + return false; ++ /* reject invalid/our STA address */ ++ if (!is_valid_ether_addr(hdr->addr2) || ++ ether_addr_equal(sdata->dev->dev_addr, hdr->addr2)) ++ return false; + if (!rx->sta) { + int rate_idx; + if (status->encoding != RX_ENC_LEGACY) +-- +2.39.5 + -- 2.47.2