From: Greg Kroah-Hartman Date: Sun, 5 Jul 2026 06:03:09 +0000 (+0200) Subject: drop patch already in last release X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23c36623e22fce0d54f279804549c424a8086707;p=thirdparty%2Fkernel%2Fstable-queue.git drop patch already in last release --- diff --git a/queue-6.12/kernel-fork-clear-pf_block_ts-in-copy_process.patch b/queue-6.12/kernel-fork-clear-pf_block_ts-in-copy_process.patch deleted file mode 100644 index 807720c115..0000000000 --- a/queue-6.12/kernel-fork-clear-pf_block_ts-in-copy_process.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 753a6b0ee88ec528751193273d6f92bc00431cf6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 16 Jun 2026 07:15:17 -0700 -Subject: kernel/fork: clear PF_BLOCK_TS in copy_process() - -From: Usama Arif - -[ Upstream commit fd38b75c4b43295b10d69772a46d1c74dbd6fc81 ] - -PF_BLOCK_TS is only set in blk_time_get_ns() when current->plug is -non-NULL, and blk_finish_plug() clears it via __blk_flush_plug() -before NULLing the plug pointer. copy_process() breaks the -invariant by inheriting PF_BLOCK_TS from the parent while resetting -the child's plug to NULL. - -Clear PF_BLOCK_TS alongside that assignment so callers can rely on -"PF_BLOCK_TS set implies current->plug != NULL" and dereference -current->plug unguarded. - -Fixes: 06b23f92af87 ("block: update cached timestamp post schedule/preemption") -Cc: stable@vger.kernel.org -Signed-off-by: Usama Arif -Link: https://patch.msgid.link/20260616141604.328820-2-usama.arif@linux.dev -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - kernel/fork.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kernel/fork.c b/kernel/fork.c -index c4955cffcb6f4e..c81b45509e8ab1 100644 ---- a/kernel/fork.c -+++ b/kernel/fork.c -@@ -2450,6 +2450,7 @@ __latent_entropy struct task_struct *copy_process( - - #ifdef CONFIG_BLOCK - p->plug = NULL; -+ p->flags &= ~PF_BLOCK_TS; - #endif - futex_init_task(p); - --- -2.53.0 - diff --git a/queue-6.12/series b/queue-6.12/series index 88309abee0..f63cf92650 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -1,6 +1,5 @@ bpf-arm64-reject-out-of-range-b.cond-targets.patch nfsd-fix-file-change-detection-in-cb_getattr.patch nfsd-release-layout-stid-on-setlease-failure.patch -kernel-fork-clear-pf_block_ts-in-copy_process.patch userfaultfd-gate-must_wait-writability-check-on-pte_.patch perf-fix-dangling-cgroup-pointer-in-cpuctx-backport.patch diff --git a/queue-6.18/kernel-fork-clear-pf_block_ts-in-copy_process.patch b/queue-6.18/kernel-fork-clear-pf_block_ts-in-copy_process.patch deleted file mode 100644 index 2988bd6601..0000000000 --- a/queue-6.18/kernel-fork-clear-pf_block_ts-in-copy_process.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 77ca1ddf431d2da2c0a0f90448a6a286cfb3f90e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 16 Jun 2026 07:15:17 -0700 -Subject: kernel/fork: clear PF_BLOCK_TS in copy_process() - -From: Usama Arif - -[ Upstream commit fd38b75c4b43295b10d69772a46d1c74dbd6fc81 ] - -PF_BLOCK_TS is only set in blk_time_get_ns() when current->plug is -non-NULL, and blk_finish_plug() clears it via __blk_flush_plug() -before NULLing the plug pointer. copy_process() breaks the -invariant by inheriting PF_BLOCK_TS from the parent while resetting -the child's plug to NULL. - -Clear PF_BLOCK_TS alongside that assignment so callers can rely on -"PF_BLOCK_TS set implies current->plug != NULL" and dereference -current->plug unguarded. - -Fixes: 06b23f92af87 ("block: update cached timestamp post schedule/preemption") -Cc: stable@vger.kernel.org -Signed-off-by: Usama Arif -Link: https://patch.msgid.link/20260616141604.328820-2-usama.arif@linux.dev -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - kernel/fork.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kernel/fork.c b/kernel/fork.c -index 1215d3f52c6d21..8b1238d692916c 100644 ---- a/kernel/fork.c -+++ b/kernel/fork.c -@@ -2230,6 +2230,7 @@ __latent_entropy struct task_struct *copy_process( - - #ifdef CONFIG_BLOCK - p->plug = NULL; -+ p->flags &= ~PF_BLOCK_TS; - #endif - futex_init_task(p); - --- -2.53.0 - diff --git a/queue-6.18/series b/queue-6.18/series index 4170be490c..bafe9a3f46 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -2,7 +2,6 @@ bpf-arm64-reject-out-of-range-b.cond-targets.patch nfsd-update-mtime-ctime-on-clone-in-presense-of-dele.patch nfsd-update-mtime-ctime-on-copy-in-presence-of-deleg.patch nfsd-release-layout-stid-on-setlease-failure.patch -kernel-fork-clear-pf_block_ts-in-copy_process.patch rust-str-use-the-kernel-vertical-imports-style.patch rust-str-clean-unused-import-for-rust-1.98.patch userfaultfd-gate-must_wait-writability-check-on-pte_.patch diff --git a/queue-7.1/kernel-fork-clear-pf_block_ts-in-copy_process.patch b/queue-7.1/kernel-fork-clear-pf_block_ts-in-copy_process.patch deleted file mode 100644 index 447657f67b..0000000000 --- a/queue-7.1/kernel-fork-clear-pf_block_ts-in-copy_process.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ea519a7176053ec52a11367b7d72cbf92a7a79d8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 16 Jun 2026 07:15:17 -0700 -Subject: kernel/fork: clear PF_BLOCK_TS in copy_process() - -From: Usama Arif - -[ Upstream commit fd38b75c4b43295b10d69772a46d1c74dbd6fc81 ] - -PF_BLOCK_TS is only set in blk_time_get_ns() when current->plug is -non-NULL, and blk_finish_plug() clears it via __blk_flush_plug() -before NULLing the plug pointer. copy_process() breaks the -invariant by inheriting PF_BLOCK_TS from the parent while resetting -the child's plug to NULL. - -Clear PF_BLOCK_TS alongside that assignment so callers can rely on -"PF_BLOCK_TS set implies current->plug != NULL" and dereference -current->plug unguarded. - -Fixes: 06b23f92af87 ("block: update cached timestamp post schedule/preemption") -Cc: stable@vger.kernel.org -Signed-off-by: Usama Arif -Link: https://patch.msgid.link/20260616141604.328820-2-usama.arif@linux.dev -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - kernel/fork.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kernel/fork.c b/kernel/fork.c -index 8ac38beae360b4..145bcc4c8e125e 100644 ---- a/kernel/fork.c -+++ b/kernel/fork.c -@@ -2314,6 +2314,7 @@ __latent_entropy struct task_struct *copy_process( - - #ifdef CONFIG_BLOCK - p->plug = NULL; -+ p->flags &= ~PF_BLOCK_TS; - #endif - futex_init_task(p); - --- -2.53.0 - diff --git a/queue-7.1/series b/queue-7.1/series index 47563e403d..2b10839b9c 100644 --- a/queue-7.1/series +++ b/queue-7.1/series @@ -1,4 +1,3 @@ -kernel-fork-clear-pf_block_ts-in-copy_process.patch rust-str-use-the-kernel-vertical-imports-style.patch rust-str-clean-unused-import-for-rust-1.98.patch userfaultfd-gate-must_wait-writability-check-on-pte_.patch