From: Greg Kroah-Hartman Date: Sat, 13 Sep 2025 13:19:46 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.1.153~65 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15aadb5ac6b03387452c33057686f76ad8efd77d;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: compiler-clang.h-define-__sanitize_-__-macros-only-when-undefined.patch edac-altera-delete-an-inappropriate-dma_free_coherent-call.patch fuse-check-if-copy_file_range-returns-larger-than-requested-size.patch fuse-prevent-overflow-in-copy_file_range-return-value.patch mptcp-sockopt-make-sync_socket_options-propagate-sock_keepopen.patch mtd-rawnand-stm32_fmc2-avoid-overlapping-mappings-on-ecc-buffer.patch mtd-rawnand-stm32_fmc2-fix-ecc-overwrite.patch net-usb-asix-ax88772-drop-phylink-use-in-pm-to-avoid-mdio-runtime-pm-wakeups.patch ocfs2-fix-recursive-semaphore-deadlock-in-fiemap-call.patch revert-sunrpc-don-t-allow-waiting-for-exiting-tasks.patch --- diff --git a/queue-6.1/compiler-clang.h-define-__sanitize_-__-macros-only-when-undefined.patch b/queue-6.1/compiler-clang.h-define-__sanitize_-__-macros-only-when-undefined.patch new file mode 100644 index 0000000000..5519ffcb1e --- /dev/null +++ b/queue-6.1/compiler-clang.h-define-__sanitize_-__-macros-only-when-undefined.patch @@ -0,0 +1,96 @@ +From 3fac212fe489aa0dbe8d80a42a7809840ca7b0f9 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Tue, 2 Sep 2025 15:49:26 -0700 +Subject: compiler-clang.h: define __SANITIZE_*__ macros only when undefined + +From: Nathan Chancellor + +commit 3fac212fe489aa0dbe8d80a42a7809840ca7b0f9 upstream. + +Clang 22 recently added support for defining __SANITIZE__ macros similar +to GCC [1], which causes warnings (or errors with CONFIG_WERROR=y or W=e) +with the existing defines that the kernel creates to emulate this behavior +with existing clang versions. + + In file included from :3: + In file included from include/linux/compiler_types.h:171: + include/linux/compiler-clang.h:37:9: error: '__SANITIZE_THREAD__' macro redefined [-Werror,-Wmacro-redefined] + 37 | #define __SANITIZE_THREAD__ + | ^ + :352:9: note: previous definition is here + 352 | #define __SANITIZE_THREAD__ 1 + | ^ + +Refactor compiler-clang.h to only define the sanitizer macros when they +are undefined and adjust the rest of the code to use these macros for +checking if the sanitizers are enabled, clearing up the warnings and +allowing the kernel to easily drop these defines when the minimum +supported version of LLVM for building the kernel becomes 22.0.0 or newer. + +Link: https://lkml.kernel.org/r/20250902-clang-update-sanitize-defines-v1-1-cf3702ca3d92@kernel.org +Link: https://github.com/llvm/llvm-project/commit/568c23bbd3303518c5056d7f03444dae4fdc8a9c [1] +Signed-off-by: Nathan Chancellor +Reviewed-by: Justin Stitt +Cc: Alexander Potapenko +Cc: Andrey Konovalov +Cc: Andrey Ryabinin +Cc: Bill Wendling +Cc: Dmitriy Vyukov +Cc: Marco Elver +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/compiler-clang.h | 29 ++++++++++++++++++++++++----- + 1 file changed, 24 insertions(+), 5 deletions(-) + +--- a/include/linux/compiler-clang.h ++++ b/include/linux/compiler-clang.h +@@ -23,23 +23,42 @@ + #define KASAN_ABI_VERSION 5 + + /* ++ * Clang 22 added preprocessor macros to match GCC, in hopes of eventually ++ * dropping __has_feature support for sanitizers: ++ * https://github.com/llvm/llvm-project/commit/568c23bbd3303518c5056d7f03444dae4fdc8a9c ++ * Create these macros for older versions of clang so that it is easy to clean ++ * up once the minimum supported version of LLVM for building the kernel always ++ * creates these macros. ++ * + * Note: Checking __has_feature(*_sanitizer) is only true if the feature is + * enabled. Therefore it is not required to additionally check defined(CONFIG_*) + * to avoid adding redundant attributes in other configurations. + */ ++#if __has_feature(address_sanitizer) && !defined(__SANITIZE_ADDRESS__) ++#define __SANITIZE_ADDRESS__ ++#endif ++#if __has_feature(hwaddress_sanitizer) && !defined(__SANITIZE_HWADDRESS__) ++#define __SANITIZE_HWADDRESS__ ++#endif ++#if __has_feature(thread_sanitizer) && !defined(__SANITIZE_THREAD__) ++#define __SANITIZE_THREAD__ ++#endif + +-#if __has_feature(address_sanitizer) || __has_feature(hwaddress_sanitizer) +-/* Emulate GCC's __SANITIZE_ADDRESS__ flag */ ++/* ++ * Treat __SANITIZE_HWADDRESS__ the same as __SANITIZE_ADDRESS__ in the kernel. ++ */ ++#ifdef __SANITIZE_HWADDRESS__ + #define __SANITIZE_ADDRESS__ ++#endif ++ ++#ifdef __SANITIZE_ADDRESS__ + #define __no_sanitize_address \ + __attribute__((no_sanitize("address", "hwaddress"))) + #else + #define __no_sanitize_address + #endif + +-#if __has_feature(thread_sanitizer) +-/* emulate gcc's __SANITIZE_THREAD__ flag */ +-#define __SANITIZE_THREAD__ ++#ifdef __SANITIZE_THREAD__ + #define __no_sanitize_thread \ + __attribute__((no_sanitize("thread"))) + #else diff --git a/queue-6.1/edac-altera-delete-an-inappropriate-dma_free_coherent-call.patch b/queue-6.1/edac-altera-delete-an-inappropriate-dma_free_coherent-call.patch new file mode 100644 index 0000000000..d33593f09a --- /dev/null +++ b/queue-6.1/edac-altera-delete-an-inappropriate-dma_free_coherent-call.patch @@ -0,0 +1,38 @@ +From ff2a66d21fd2364ed9396d151115eec59612b200 Mon Sep 17 00:00:00 2001 +From: Salah Triki +Date: Thu, 31 Jul 2025 04:15:27 +0100 +Subject: EDAC/altera: Delete an inappropriate dma_free_coherent() call + +From: Salah Triki + +commit ff2a66d21fd2364ed9396d151115eec59612b200 upstream. + +dma_free_coherent() must only be called if the corresponding +dma_alloc_coherent() call has succeeded. Calling it when the allocation fails +leads to undefined behavior. + +Delete the wrong call. + + [ bp: Massage commit message. ] + +Fixes: 71bcada88b0f3 ("edac: altera: Add Altera SDRAM EDAC support") +Signed-off-by: Salah Triki +Signed-off-by: Borislav Petkov (AMD) +Acked-by: Dinh Nguyen +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/aIrfzzqh4IzYtDVC@pc +Signed-off-by: Greg Kroah-Hartman +--- + drivers/edac/altera_edac.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/edac/altera_edac.c ++++ b/drivers/edac/altera_edac.c +@@ -127,7 +127,6 @@ static ssize_t altr_sdr_mc_err_inject_wr + + ptemp = dma_alloc_coherent(mci->pdev, 16, &dma_handle, GFP_KERNEL); + if (!ptemp) { +- dma_free_coherent(mci->pdev, 16, ptemp, dma_handle); + edac_printk(KERN_ERR, EDAC_MC, + "Inject: Buffer Allocation error\n"); + return -ENOMEM; diff --git a/queue-6.1/fuse-check-if-copy_file_range-returns-larger-than-requested-size.patch b/queue-6.1/fuse-check-if-copy_file_range-returns-larger-than-requested-size.patch new file mode 100644 index 0000000000..4e63240096 --- /dev/null +++ b/queue-6.1/fuse-check-if-copy_file_range-returns-larger-than-requested-size.patch @@ -0,0 +1,34 @@ +From e5203209b3935041dac541bc5b37efb44220cc0b Mon Sep 17 00:00:00 2001 +From: Miklos Szeredi +Date: Tue, 12 Aug 2025 14:07:54 +0200 +Subject: fuse: check if copy_file_range() returns larger than requested size + +From: Miklos Szeredi + +commit e5203209b3935041dac541bc5b37efb44220cc0b upstream. + +Just like write(), copy_file_range() should check if the return value is +less or equal to the requested number of bytes. + +Reported-by: Chunsheng Luo +Closes: https://lore.kernel.org/all/20250807062425.694-1-luochunsheng@ustc.edu/ +Fixes: 88bc7d5097a1 ("fuse: add support for copy_file_range()") +Cc: # v4.20 +Signed-off-by: Miklos Szeredi +Signed-off-by: Greg Kroah-Hartman +--- + fs/fuse/file.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/fs/fuse/file.c ++++ b/fs/fuse/file.c +@@ -3169,6 +3169,9 @@ static ssize_t __fuse_copy_file_range(st + fc->no_copy_file_range = 1; + err = -EOPNOTSUPP; + } ++ if (!err && outarg.size > len) ++ err = -EIO; ++ + if (err) + goto out; + diff --git a/queue-6.1/fuse-prevent-overflow-in-copy_file_range-return-value.patch b/queue-6.1/fuse-prevent-overflow-in-copy_file_range-return-value.patch new file mode 100644 index 0000000000..065db68cac --- /dev/null +++ b/queue-6.1/fuse-prevent-overflow-in-copy_file_range-return-value.patch @@ -0,0 +1,38 @@ +From 1e08938c3694f707bb165535df352ac97a8c75c9 Mon Sep 17 00:00:00 2001 +From: Miklos Szeredi +Date: Tue, 12 Aug 2025 14:46:34 +0200 +Subject: fuse: prevent overflow in copy_file_range return value + +From: Miklos Szeredi + +commit 1e08938c3694f707bb165535df352ac97a8c75c9 upstream. + +The FUSE protocol uses struct fuse_write_out to convey the return value of +copy_file_range, which is restricted to uint32_t. But the COPY_FILE_RANGE +interface supports a 64-bit size copies. + +Currently the number of bytes copied is silently truncated to 32-bit, which +may result in poor performance or even failure to copy in case of +truncation to zero. + +Reported-by: Florian Weimer +Closes: https://lore.kernel.org/all/lhuh5ynl8z5.fsf@oldenburg.str.redhat.com/ +Fixes: 88bc7d5097a1 ("fuse: add support for copy_file_range()") +Cc: # v4.20 +Signed-off-by: Miklos Szeredi +Signed-off-by: Greg Kroah-Hartman +--- + fs/fuse/file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/fuse/file.c ++++ b/fs/fuse/file.c +@@ -3103,7 +3103,7 @@ static ssize_t __fuse_copy_file_range(st + .nodeid_out = ff_out->nodeid, + .fh_out = ff_out->fh, + .off_out = pos_out, +- .len = len, ++ .len = min_t(size_t, len, UINT_MAX & PAGE_MASK), + .flags = flags + }; + struct fuse_write_out outarg; diff --git a/queue-6.1/mptcp-sockopt-make-sync_socket_options-propagate-sock_keepopen.patch b/queue-6.1/mptcp-sockopt-make-sync_socket_options-propagate-sock_keepopen.patch new file mode 100644 index 0000000000..8553a29ae6 --- /dev/null +++ b/queue-6.1/mptcp-sockopt-make-sync_socket_options-propagate-sock_keepopen.patch @@ -0,0 +1,65 @@ +From 648de37416b301f046f62f1b65715c7fa8ebaa67 Mon Sep 17 00:00:00 2001 +From: Krister Johansen +Date: Mon, 8 Sep 2025 11:16:01 -0700 +Subject: mptcp: sockopt: make sync_socket_options propagate SOCK_KEEPOPEN + +From: Krister Johansen + +commit 648de37416b301f046f62f1b65715c7fa8ebaa67 upstream. + +Users reported a scenario where MPTCP connections that were configured +with SO_KEEPALIVE prior to connect would fail to enable their keepalives +if MTPCP fell back to TCP mode. + +After investigating, this affects keepalives for any connection where +sync_socket_options is called on a socket that is in the closed or +listening state. Joins are handled properly. For connects, +sync_socket_options is called when the socket is still in the closed +state. The tcp_set_keepalive() function does not act on sockets that +are closed or listening, hence keepalive is not immediately enabled. +Since the SO_KEEPOPEN flag is absent, it is not enabled later in the +connect sequence via tcp_finish_connect. Setting the keepalive via +sockopt after connect does work, but would not address any subsequently +created flows. + +Fortunately, the fix here is straight-forward: set SOCK_KEEPOPEN on the +subflow when calling sync_socket_options. + +The fix was valdidated both by using tcpdump to observe keepalive +packets not being sent before the fix, and being sent after the fix. It +was also possible to observe via ss that the keepalive timer was not +enabled on these sockets before the fix, but was enabled afterwards. + +Fixes: 1b3e7ede1365 ("mptcp: setsockopt: handle SO_KEEPALIVE and SO_PRIORITY") +Cc: stable@vger.kernel.org +Signed-off-by: Krister Johansen +Reviewed-by: Geliang Tang +Reviewed-by: Matthieu Baerts (NGI0) +Link: https://patch.msgid.link/aL8dYfPZrwedCIh9@templeofstupid.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/mptcp/sockopt.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +--- a/net/mptcp/sockopt.c ++++ b/net/mptcp/sockopt.c +@@ -1347,13 +1347,12 @@ static void sync_socket_options(struct m + { + static const unsigned int tx_rx_locks = SOCK_RCVBUF_LOCK | SOCK_SNDBUF_LOCK; + struct sock *sk = (struct sock *)msk; ++ bool keep_open; + +- if (ssk->sk_prot->keepalive) { +- if (sock_flag(sk, SOCK_KEEPOPEN)) +- ssk->sk_prot->keepalive(ssk, 1); +- else +- ssk->sk_prot->keepalive(ssk, 0); +- } ++ keep_open = sock_flag(sk, SOCK_KEEPOPEN); ++ if (ssk->sk_prot->keepalive) ++ ssk->sk_prot->keepalive(ssk, keep_open); ++ sock_valbool_flag(ssk, SOCK_KEEPOPEN, keep_open); + + ssk->sk_priority = sk->sk_priority; + ssk->sk_bound_dev_if = sk->sk_bound_dev_if; diff --git a/queue-6.1/mtd-rawnand-stm32_fmc2-avoid-overlapping-mappings-on-ecc-buffer.patch b/queue-6.1/mtd-rawnand-stm32_fmc2-avoid-overlapping-mappings-on-ecc-buffer.patch new file mode 100644 index 0000000000..933a836071 --- /dev/null +++ b/queue-6.1/mtd-rawnand-stm32_fmc2-avoid-overlapping-mappings-on-ecc-buffer.patch @@ -0,0 +1,134 @@ +From 513c40e59d5a414ab763a9c84797534b5e8c208d Mon Sep 17 00:00:00 2001 +From: Christophe Kerello +Date: Tue, 12 Aug 2025 09:26:58 +0200 +Subject: mtd: rawnand: stm32_fmc2: avoid overlapping mappings on ECC buffer + +From: Christophe Kerello + +commit 513c40e59d5a414ab763a9c84797534b5e8c208d upstream. + +Avoid below overlapping mappings by using a contiguous +non-cacheable buffer. + +[ 4.077708] DMA-API: stm32_fmc2_nfc 48810000.nand-controller: cacheline tracking EEXIST, +overlapping mappings aren't supported +[ 4.089103] WARNING: CPU: 1 PID: 44 at kernel/dma/debug.c:568 add_dma_entry+0x23c/0x300 +[ 4.097071] Modules linked in: +[ 4.100101] CPU: 1 PID: 44 Comm: kworker/u4:2 Not tainted 6.1.82 #1 +[ 4.106346] Hardware name: STMicroelectronics STM32MP257F VALID1 SNOR / MB1704 (LPDDR4 Power discrete) + MB1703 + MB1708 (SNOR MB1730) (DT) +[ 4.118824] Workqueue: events_unbound deferred_probe_work_func +[ 4.124674] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) +[ 4.131624] pc : add_dma_entry+0x23c/0x300 +[ 4.135658] lr : add_dma_entry+0x23c/0x300 +[ 4.139792] sp : ffff800009dbb490 +[ 4.143016] x29: ffff800009dbb4a0 x28: 0000000004008022 x27: ffff8000098a6000 +[ 4.150174] x26: 0000000000000000 x25: ffff8000099e7000 x24: ffff8000099e7de8 +[ 4.157231] x23: 00000000ffffffff x22: 0000000000000000 x21: ffff8000098a6a20 +[ 4.164388] x20: ffff000080964180 x19: ffff800009819ba0 x18: 0000000000000006 +[ 4.171545] x17: 6361727420656e69 x16: 6c6568636163203a x15: 72656c6c6f72746e +[ 4.178602] x14: 6f632d646e616e2e x13: ffff800009832f58 x12: 00000000000004ec +[ 4.185759] x11: 00000000000001a4 x10: ffff80000988af58 x9 : ffff800009832f58 +[ 4.192916] x8 : 00000000ffffefff x7 : ffff80000988af58 x6 : 80000000fffff000 +[ 4.199972] x5 : 000000000000bff4 x4 : 0000000000000000 x3 : 0000000000000000 +[ 4.207128] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff0000812d2c40 +[ 4.214185] Call trace: +[ 4.216605] add_dma_entry+0x23c/0x300 +[ 4.220338] debug_dma_map_sg+0x198/0x350 +[ 4.224373] __dma_map_sg_attrs+0xa0/0x110 +[ 4.228411] dma_map_sg_attrs+0x10/0x2c +[ 4.232247] stm32_fmc2_nfc_xfer.isra.0+0x1c8/0x3fc +[ 4.237088] stm32_fmc2_nfc_seq_read_page+0xc8/0x174 +[ 4.242127] nand_read_oob+0x1d4/0x8e0 +[ 4.245861] mtd_read_oob_std+0x58/0x84 +[ 4.249596] mtd_read_oob+0x90/0x150 +[ 4.253231] mtd_read+0x68/0xac + +Signed-off-by: Christophe Kerello +Cc: stable@vger.kernel.org +Fixes: 2cd457f328c1 ("mtd: rawnand: stm32_fmc2: add STM32 FMC2 NAND flash controller driver") +Signed-off-by: Miquel Raynal +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 28 +++++++++------------------- + 1 file changed, 9 insertions(+), 19 deletions(-) + +--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c ++++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c +@@ -263,6 +263,7 @@ struct stm32_fmc2_nfc { + struct sg_table dma_data_sg; + struct sg_table dma_ecc_sg; + u8 *ecc_buf; ++ dma_addr_t dma_ecc_addr; + int dma_ecc_len; + + struct completion complete; +@@ -885,17 +886,10 @@ static int stm32_fmc2_nfc_xfer(struct na + + if (!write_data && !raw) { + /* Configure DMA ECC status */ +- p = nfc->ecc_buf; + for_each_sg(nfc->dma_ecc_sg.sgl, sg, eccsteps, s) { +- sg_set_buf(sg, p, nfc->dma_ecc_len); +- p += nfc->dma_ecc_len; +- } +- +- ret = dma_map_sg(nfc->dev, nfc->dma_ecc_sg.sgl, +- eccsteps, dma_data_dir); +- if (!ret) { +- ret = -EIO; +- goto err_unmap_data; ++ sg_dma_address(sg) = nfc->dma_ecc_addr + ++ s * nfc->dma_ecc_len; ++ sg_dma_len(sg) = nfc->dma_ecc_len; + } + + desc_ecc = dmaengine_prep_slave_sg(nfc->dma_ecc_ch, +@@ -904,7 +898,7 @@ static int stm32_fmc2_nfc_xfer(struct na + DMA_PREP_INTERRUPT); + if (!desc_ecc) { + ret = -ENOMEM; +- goto err_unmap_ecc; ++ goto err_unmap_data; + } + + reinit_completion(&nfc->dma_ecc_complete); +@@ -912,7 +906,7 @@ static int stm32_fmc2_nfc_xfer(struct na + desc_ecc->callback_param = &nfc->dma_ecc_complete; + ret = dma_submit_error(dmaengine_submit(desc_ecc)); + if (ret) +- goto err_unmap_ecc; ++ goto err_unmap_data; + + dma_async_issue_pending(nfc->dma_ecc_ch); + } +@@ -932,7 +926,7 @@ static int stm32_fmc2_nfc_xfer(struct na + if (!write_data && !raw) + dmaengine_terminate_all(nfc->dma_ecc_ch); + ret = -ETIMEDOUT; +- goto err_unmap_ecc; ++ goto err_unmap_data; + } + + /* Wait DMA data transfer completion */ +@@ -952,11 +946,6 @@ static int stm32_fmc2_nfc_xfer(struct na + } + } + +-err_unmap_ecc: +- if (!write_data && !raw) +- dma_unmap_sg(nfc->dev, nfc->dma_ecc_sg.sgl, +- eccsteps, dma_data_dir); +- + err_unmap_data: + dma_unmap_sg(nfc->dev, nfc->dma_data_sg.sgl, eccsteps, dma_data_dir); + +@@ -1582,7 +1571,8 @@ static int stm32_fmc2_nfc_dma_setup(stru + return ret; + + /* Allocate a buffer to store ECC status registers */ +- nfc->ecc_buf = devm_kzalloc(nfc->dev, FMC2_MAX_ECC_BUF_LEN, GFP_KERNEL); ++ nfc->ecc_buf = dmam_alloc_coherent(nfc->dev, FMC2_MAX_ECC_BUF_LEN, ++ &nfc->dma_ecc_addr, GFP_KERNEL); + if (!nfc->ecc_buf) + return -ENOMEM; + diff --git a/queue-6.1/mtd-rawnand-stm32_fmc2-fix-ecc-overwrite.patch b/queue-6.1/mtd-rawnand-stm32_fmc2-fix-ecc-overwrite.patch new file mode 100644 index 0000000000..d15910c67d --- /dev/null +++ b/queue-6.1/mtd-rawnand-stm32_fmc2-fix-ecc-overwrite.patch @@ -0,0 +1,49 @@ +From 811c0da4542df3c065f6cb843ced68780e27bb44 Mon Sep 17 00:00:00 2001 +From: Christophe Kerello +Date: Tue, 12 Aug 2025 09:30:08 +0200 +Subject: mtd: rawnand: stm32_fmc2: fix ECC overwrite + +From: Christophe Kerello + +commit 811c0da4542df3c065f6cb843ced68780e27bb44 upstream. + +In case OOB write is requested during a data write, ECC is currently +lost. Avoid this issue by only writing in the free spare area. +This issue has been seen with a YAFFS2 file system. + +Signed-off-by: Christophe Kerello +Cc: stable@vger.kernel.org +Fixes: 2cd457f328c1 ("mtd: rawnand: stm32_fmc2: add STM32 FMC2 NAND flash controller driver") +Signed-off-by: Miquel Raynal +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c ++++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c +@@ -968,9 +968,21 @@ static int stm32_fmc2_nfc_seq_write(stru + + /* Write oob */ + if (oob_required) { +- ret = nand_change_write_column_op(chip, mtd->writesize, +- chip->oob_poi, mtd->oobsize, +- false); ++ unsigned int offset_in_page = mtd->writesize; ++ const void *buf = chip->oob_poi; ++ unsigned int len = mtd->oobsize; ++ ++ if (!raw) { ++ struct mtd_oob_region oob_free; ++ ++ mtd_ooblayout_free(mtd, 0, &oob_free); ++ offset_in_page += oob_free.offset; ++ buf += oob_free.offset; ++ len = oob_free.length; ++ } ++ ++ ret = nand_change_write_column_op(chip, offset_in_page, ++ buf, len, false); + if (ret) + return ret; + } diff --git a/queue-6.1/net-usb-asix-ax88772-drop-phylink-use-in-pm-to-avoid-mdio-runtime-pm-wakeups.patch b/queue-6.1/net-usb-asix-ax88772-drop-phylink-use-in-pm-to-avoid-mdio-runtime-pm-wakeups.patch new file mode 100644 index 0000000000..1687c76512 --- /dev/null +++ b/queue-6.1/net-usb-asix-ax88772-drop-phylink-use-in-pm-to-avoid-mdio-runtime-pm-wakeups.patch @@ -0,0 +1,73 @@ +From 5537a4679403423e0b49c95b619983a4583d69c5 Mon Sep 17 00:00:00 2001 +From: Oleksij Rempel +Date: Mon, 8 Sep 2025 13:26:19 +0200 +Subject: net: usb: asix: ax88772: drop phylink use in PM to avoid MDIO runtime PM wakeups +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Oleksij Rempel + +commit 5537a4679403423e0b49c95b619983a4583d69c5 upstream. + +Drop phylink_{suspend,resume}() from ax88772 PM callbacks. + +MDIO bus accesses have their own runtime-PM handling and will try to +wake the device if it is suspended. Such wake attempts must not happen +from PM callbacks while the device PM lock is held. Since phylink +{sus|re}sume may trigger MDIO, it must not be called in PM context. + +No extra phylink PM handling is required for this driver: +- .ndo_open/.ndo_stop control the phylink start/stop lifecycle. +- ethtool/phylib entry points run in process context, not PM. +- phylink MAC ops program the MAC on link changes after resume. + +Fixes: e0bffe3e6894 ("net: asix: ax88772: migrate to phylink") +Reported-by: Hubert Wiśniewski +Cc: stable@vger.kernel.org +Signed-off-by: Oleksij Rempel +Tested-by: Hubert Wiśniewski +Tested-by: Xu Yang +Link: https://patch.msgid.link/20250908112619.2900723-1-o.rempel@pengutronix.de +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/asix_devices.c | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c +index 792ddda1ad49..1e8f7089f5e8 100644 +--- a/drivers/net/usb/asix_devices.c ++++ b/drivers/net/usb/asix_devices.c +@@ -607,15 +607,8 @@ static const struct net_device_ops ax88772_netdev_ops = { + + static void ax88772_suspend(struct usbnet *dev) + { +- struct asix_common_private *priv = dev->driver_priv; + u16 medium; + +- if (netif_running(dev->net)) { +- rtnl_lock(); +- phylink_suspend(priv->phylink, false); +- rtnl_unlock(); +- } +- + /* Stop MAC operation */ + medium = asix_read_medium_status(dev, 1); + medium &= ~AX_MEDIUM_RE; +@@ -644,12 +637,6 @@ static void ax88772_resume(struct usbnet *dev) + for (i = 0; i < 3; i++) + if (!priv->reset(dev, 1)) + break; +- +- if (netif_running(dev->net)) { +- rtnl_lock(); +- phylink_resume(priv->phylink); +- rtnl_unlock(); +- } + } + + static int asix_resume(struct usb_interface *intf) +-- +2.51.0 + diff --git a/queue-6.1/ocfs2-fix-recursive-semaphore-deadlock-in-fiemap-call.patch b/queue-6.1/ocfs2-fix-recursive-semaphore-deadlock-in-fiemap-call.patch new file mode 100644 index 0000000000..d97a315d58 --- /dev/null +++ b/queue-6.1/ocfs2-fix-recursive-semaphore-deadlock-in-fiemap-call.patch @@ -0,0 +1,138 @@ +From 04100f775c2ea501927f508f17ad824ad1f23c8d Mon Sep 17 00:00:00 2001 +From: Mark Tinguely +Date: Fri, 29 Aug 2025 10:18:15 -0500 +Subject: ocfs2: fix recursive semaphore deadlock in fiemap call + +From: Mark Tinguely + +commit 04100f775c2ea501927f508f17ad824ad1f23c8d upstream. + +syzbot detected a OCFS2 hang due to a recursive semaphore on a +FS_IOC_FIEMAP of the extent list on a specially crafted mmap file. + +context_switch kernel/sched/core.c:5357 [inline] + __schedule+0x1798/0x4cc0 kernel/sched/core.c:6961 + __schedule_loop kernel/sched/core.c:7043 [inline] + schedule+0x165/0x360 kernel/sched/core.c:7058 + schedule_preempt_disabled+0x13/0x30 kernel/sched/core.c:7115 + rwsem_down_write_slowpath+0x872/0xfe0 kernel/locking/rwsem.c:1185 + __down_write_common kernel/locking/rwsem.c:1317 [inline] + __down_write kernel/locking/rwsem.c:1326 [inline] + down_write+0x1ab/0x1f0 kernel/locking/rwsem.c:1591 + ocfs2_page_mkwrite+0x2ff/0xc40 fs/ocfs2/mmap.c:142 + do_page_mkwrite+0x14d/0x310 mm/memory.c:3361 + wp_page_shared mm/memory.c:3762 [inline] + do_wp_page+0x268d/0x5800 mm/memory.c:3981 + handle_pte_fault mm/memory.c:6068 [inline] + __handle_mm_fault+0x1033/0x5440 mm/memory.c:6195 + handle_mm_fault+0x40a/0x8e0 mm/memory.c:6364 + do_user_addr_fault+0x764/0x1390 arch/x86/mm/fault.c:1387 + handle_page_fault arch/x86/mm/fault.c:1476 [inline] + exc_page_fault+0x76/0xf0 arch/x86/mm/fault.c:1532 + asm_exc_page_fault+0x26/0x30 arch/x86/include/asm/idtentry.h:623 +RIP: 0010:copy_user_generic arch/x86/include/asm/uaccess_64.h:126 [inline] +RIP: 0010:raw_copy_to_user arch/x86/include/asm/uaccess_64.h:147 [inline] +RIP: 0010:_inline_copy_to_user include/linux/uaccess.h:197 [inline] +RIP: 0010:_copy_to_user+0x85/0xb0 lib/usercopy.c:26 +Code: e8 00 bc f7 fc 4d 39 fc 72 3d 4d 39 ec 77 38 e8 91 b9 f7 fc 4c 89 +f7 89 de e8 47 25 5b fd 0f 01 cb 4c 89 ff 48 89 d9 4c 89 f6 a4 0f +1f 00 48 89 cb 0f 01 ca 48 89 d8 5b 41 5c 41 5d 41 5e 41 +RSP: 0018:ffffc9000403f950 EFLAGS: 00050256 +RAX: ffffffff84c7f101 RBX: 0000000000000038 RCX: 0000000000000038 +RDX: 0000000000000000 RSI: ffffc9000403f9e0 RDI: 0000200000000060 +RBP: ffffc9000403fa90 R08: ffffc9000403fa17 R09: 1ffff92000807f42 +R10: dffffc0000000000 R11: fffff52000807f43 R12: 0000200000000098 +R13: 00007ffffffff000 R14: ffffc9000403f9e0 R15: 0000200000000060 + copy_to_user include/linux/uaccess.h:225 [inline] + fiemap_fill_next_extent+0x1c0/0x390 fs/ioctl.c:145 + ocfs2_fiemap+0x888/0xc90 fs/ocfs2/extent_map.c:806 + ioctl_fiemap fs/ioctl.c:220 [inline] + do_vfs_ioctl+0x1173/0x1430 fs/ioctl.c:532 + __do_sys_ioctl fs/ioctl.c:596 [inline] + __se_sys_ioctl+0x82/0x170 fs/ioctl.c:584 + do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] + do_syscall_64+0xfa/0x3b0 arch/x86/entry/syscall_64.c:94 + entry_SYSCALL_64_after_hwframe+0x77/0x7f +RIP: 0033:0x7f5f13850fd9 +RSP: 002b:00007ffe3b3518b8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 +RAX: ffffffffffffffda RBX: 0000200000000000 RCX: 00007f5f13850fd9 +RDX: 0000200000000040 RSI: 00000000c020660b RDI: 0000000000000004 +RBP: 6165627472616568 R08: 0000000000000000 R09: 0000000000000000 +R10: 0000000000000000 R11: 0000000000000246 R12: 00007ffe3b3518f0 +R13: 00007ffe3b351b18 R14: 431bde82d7b634db R15: 00007f5f1389a03b + +ocfs2_fiemap() takes a read lock of the ip_alloc_sem semaphore (since +v2.6.22-527-g7307de80510a) and calls fiemap_fill_next_extent() to read the +extent list of this running mmap executable. The user supplied buffer to +hold the fiemap information page faults calling ocfs2_page_mkwrite() which +will take a write lock (since v2.6.27-38-g00dc417fa3e7) of the same +semaphore. This recursive semaphore will hold filesystem locks and causes +a hang of the fileystem. + +The ip_alloc_sem protects the inode extent list and size. Release the +read semphore before calling fiemap_fill_next_extent() in ocfs2_fiemap() +and ocfs2_fiemap_inline(). This does an unnecessary semaphore lock/unlock +on the last extent but simplifies the error path. + +Link: https://lkml.kernel.org/r/61d1a62b-2631-4f12-81e2-cd689914360b@oracle.com +Fixes: 00dc417fa3e7 ("ocfs2: fiemap support") +Signed-off-by: Mark Tinguely +Reported-by: syzbot+541dcc6ee768f77103e7@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=541dcc6ee768f77103e7 +Reviewed-by: Joseph Qi +Cc: Mark Fasheh +Cc: Joel Becker +Cc: Junxiao Bi +Cc: Changwei Ge +Cc: Jun Piao +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/ocfs2/extent_map.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +--- a/fs/ocfs2/extent_map.c ++++ b/fs/ocfs2/extent_map.c +@@ -696,6 +696,8 @@ out: + * it not only handles the fiemap for inlined files, but also deals + * with the fast symlink, cause they have no difference for extent + * mapping per se. ++ * ++ * Must be called with ip_alloc_sem semaphore held. + */ + static int ocfs2_fiemap_inline(struct inode *inode, struct buffer_head *di_bh, + struct fiemap_extent_info *fieinfo, +@@ -707,6 +709,7 @@ static int ocfs2_fiemap_inline(struct in + u64 phys; + u32 flags = FIEMAP_EXTENT_DATA_INLINE|FIEMAP_EXTENT_LAST; + struct ocfs2_inode_info *oi = OCFS2_I(inode); ++ lockdep_assert_held_read(&oi->ip_alloc_sem); + + di = (struct ocfs2_dinode *)di_bh->b_data; + if (ocfs2_inode_is_fast_symlink(inode)) +@@ -722,8 +725,11 @@ static int ocfs2_fiemap_inline(struct in + phys += offsetof(struct ocfs2_dinode, + id2.i_data.id_data); + ++ /* Release the ip_alloc_sem to prevent deadlock on page fault */ ++ up_read(&OCFS2_I(inode)->ip_alloc_sem); + ret = fiemap_fill_next_extent(fieinfo, 0, phys, id_count, + flags); ++ down_read(&OCFS2_I(inode)->ip_alloc_sem); + if (ret < 0) + return ret; + } +@@ -792,9 +798,11 @@ int ocfs2_fiemap(struct inode *inode, st + len_bytes = (u64)le16_to_cpu(rec.e_leaf_clusters) << osb->s_clustersize_bits; + phys_bytes = le64_to_cpu(rec.e_blkno) << osb->sb->s_blocksize_bits; + virt_bytes = (u64)le32_to_cpu(rec.e_cpos) << osb->s_clustersize_bits; +- ++ /* Release the ip_alloc_sem to prevent deadlock on page fault */ ++ up_read(&OCFS2_I(inode)->ip_alloc_sem); + ret = fiemap_fill_next_extent(fieinfo, virt_bytes, phys_bytes, + len_bytes, fe_flags); ++ down_read(&OCFS2_I(inode)->ip_alloc_sem); + if (ret) + break; + diff --git a/queue-6.1/revert-sunrpc-don-t-allow-waiting-for-exiting-tasks.patch b/queue-6.1/revert-sunrpc-don-t-allow-waiting-for-exiting-tasks.patch new file mode 100644 index 0000000000..4467387cdb --- /dev/null +++ b/queue-6.1/revert-sunrpc-don-t-allow-waiting-for-exiting-tasks.patch @@ -0,0 +1,35 @@ +From 199cd9e8d14bc14bdbd1fa3031ce26dac9781507 Mon Sep 17 00:00:00 2001 +From: Trond Myklebust +Date: Wed, 3 Sep 2025 09:49:33 -0400 +Subject: Revert "SUNRPC: Don't allow waiting for exiting tasks" + +From: Trond Myklebust + +commit 199cd9e8d14bc14bdbd1fa3031ce26dac9781507 upstream. + +This reverts commit 14e41b16e8cb677bb440dca2edba8b041646c742. + +This patch breaks the LTP acct02 test, so let's revert and look for a +better solution. + +Reported-by: Mark Brown +Reported-by: Harshvardhan Jha +Link: https://lore.kernel.org/linux-nfs/7d4d57b0-39a3-49f1-8ada-60364743e3b4@sirena.org.uk/ +Cc: stable@vger.kernel.org # 6.15.x +Signed-off-by: Trond Myklebust +Signed-off-by: Greg Kroah-Hartman +--- + net/sunrpc/sched.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/net/sunrpc/sched.c ++++ b/net/sunrpc/sched.c +@@ -276,8 +276,6 @@ EXPORT_SYMBOL_GPL(rpc_destroy_wait_queue + + static int rpc_wait_bit_killable(struct wait_bit_key *key, int mode) + { +- if (unlikely(current->flags & PF_EXITING)) +- return -EINTR; + schedule(); + if (signal_pending_state(mode, current)) + return -ERESTARTSYS; diff --git a/queue-6.1/series b/queue-6.1/series index 2ce00eb25c..ca9b2c695a 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -20,3 +20,13 @@ proc-fix-type-confusion-in-pde_set_flags.patch kvm-x86-move-open-coded-cpuid-leaf-0x80000021-eax-bit-propagation-code.patch kvm-svm-return-tsa_sq_no-and-tsa_l1_no-bits-in-__do_cpuid_func.patch kvm-svm-set-synthesized-tsa-cpuid-flags.patch +edac-altera-delete-an-inappropriate-dma_free_coherent-call.patch +revert-sunrpc-don-t-allow-waiting-for-exiting-tasks.patch +compiler-clang.h-define-__sanitize_-__-macros-only-when-undefined.patch +mptcp-sockopt-make-sync_socket_options-propagate-sock_keepopen.patch +ocfs2-fix-recursive-semaphore-deadlock-in-fiemap-call.patch +net-usb-asix-ax88772-drop-phylink-use-in-pm-to-avoid-mdio-runtime-pm-wakeups.patch +mtd-rawnand-stm32_fmc2-avoid-overlapping-mappings-on-ecc-buffer.patch +mtd-rawnand-stm32_fmc2-fix-ecc-overwrite.patch +fuse-check-if-copy_file_range-returns-larger-than-requested-size.patch +fuse-prevent-overflow-in-copy_file_range-return-value.patch