From 7fbc09474774d839f9cdb982acdf5fc94bbeac5a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 19 Oct 2025 14:06:28 +0200 Subject: [PATCH] drop pid patch that is being reverted upstream --- ...pid_nr_ns-ns-null-safe-for-zombie-ca.patch | 48 ------------------- queue-5.10/series | 1 - ...pid_nr_ns-ns-null-safe-for-zombie-ca.patch | 48 ------------------- queue-5.15/series | 1 - ...pid_nr_ns-ns-null-safe-for-zombie-ca.patch | 48 ------------------- queue-6.1/series | 1 - ...pid_nr_ns-ns-null-safe-for-zombie-ca.patch | 48 ------------------- queue-6.12/series | 1 - ...pid_nr_ns-ns-null-safe-for-zombie-ca.patch | 48 ------------------- queue-6.17/series | 1 - ...pid_nr_ns-ns-null-safe-for-zombie-ca.patch | 48 ------------------- queue-6.6/series | 1 - 12 files changed, 294 deletions(-) delete mode 100644 queue-5.10/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch delete mode 100644 queue-5.15/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch delete mode 100644 queue-6.1/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch delete mode 100644 queue-6.12/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch delete mode 100644 queue-6.17/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch delete mode 100644 queue-6.6/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch diff --git a/queue-5.10/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch b/queue-5.10/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch deleted file mode 100644 index bf1bcf3218..0000000000 --- a/queue-5.10/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f713b9c102237b7107812f051d9be3bf7fd94baa Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 10 Aug 2025 19:36:04 +0200 -Subject: pid: make __task_pid_nr_ns(ns => NULL) safe for zombie callers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Oleg Nesterov - -[ Upstream commit abdfd4948e45c51b19162cf8b3f5003f8f53c9b9 ] - -task_pid_vnr(another_task) will crash if the caller was already reaped. -The pid_alive(current) check can't really help, the parent/debugger can -call release_task() right after this check. - -This also means that even task_ppid_nr_ns(current, NULL) is not safe, -pid_alive() only ensures that it is safe to dereference ->real_parent. - -Change __task_pid_nr_ns() to ensure ns != NULL. - -Originally-by: 高翔 -Link: https://lore.kernel.org/all/20250802022123.3536934-1-gxxa03070307@gmail.com/ -Signed-off-by: Oleg Nesterov -Link: https://lore.kernel.org/20250810173604.GA19991@redhat.com -Signed-off-by: Christian Brauner -Signed-off-by: Sasha Levin ---- - kernel/pid.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kernel/pid.c b/kernel/pid.c -index a5a08476f3756..6dfec6bef6ab3 100644 ---- a/kernel/pid.c -+++ b/kernel/pid.c -@@ -497,7 +497,8 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, - rcu_read_lock(); - if (!ns) - ns = task_active_pid_ns(current); -- nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); -+ if (ns) -+ nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); - rcu_read_unlock(); - - return nr; --- -2.51.0 - diff --git a/queue-5.10/series b/queue-5.10/series index ed50294875..664b481318 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -187,7 +187,6 @@ kvm-x86-don-t-re-check-l1-intercepts-when-completing-userspace-i-o.patch net-9p-fix-double-req-put-in-p9_fd_cancelled.patch minixfs-verify-inode-mode-when-loading-from-disk.patch pid-add-a-judgment-for-ns-null-in-pid_nr_ns.patch -pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch fs-add-initramfs_options-to-set-initramfs-mount-opti.patch cramfs-verify-inode-mode-when-loading-from-disk.patch locking-introduce-__cleanup-based-infrastructure.patch diff --git a/queue-5.15/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch b/queue-5.15/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch deleted file mode 100644 index ba4572dd73..0000000000 --- a/queue-5.15/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch +++ /dev/null @@ -1,48 +0,0 @@ -From fc8d3c7d133deb82d720bed679b17f22d97c0d81 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 10 Aug 2025 19:36:04 +0200 -Subject: pid: make __task_pid_nr_ns(ns => NULL) safe for zombie callers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Oleg Nesterov - -[ Upstream commit abdfd4948e45c51b19162cf8b3f5003f8f53c9b9 ] - -task_pid_vnr(another_task) will crash if the caller was already reaped. -The pid_alive(current) check can't really help, the parent/debugger can -call release_task() right after this check. - -This also means that even task_ppid_nr_ns(current, NULL) is not safe, -pid_alive() only ensures that it is safe to dereference ->real_parent. - -Change __task_pid_nr_ns() to ensure ns != NULL. - -Originally-by: 高翔 -Link: https://lore.kernel.org/all/20250802022123.3536934-1-gxxa03070307@gmail.com/ -Signed-off-by: Oleg Nesterov -Link: https://lore.kernel.org/20250810173604.GA19991@redhat.com -Signed-off-by: Christian Brauner -Signed-off-by: Sasha Levin ---- - kernel/pid.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kernel/pid.c b/kernel/pid.c -index 61f6649568b25..18f67751d0a51 100644 ---- a/kernel/pid.c -+++ b/kernel/pid.c -@@ -497,7 +497,8 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, - rcu_read_lock(); - if (!ns) - ns = task_active_pid_ns(current); -- nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); -+ if (ns) -+ nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); - rcu_read_unlock(); - - return nr; --- -2.51.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 91129dfbd3..3c28e1ca42 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -258,7 +258,6 @@ minmax.h-simplify-the-variants-of-clamp.patch minmax.h-remove-some-defines-that-are-only-expanded-once.patch minixfs-verify-inode-mode-when-loading-from-disk.patch pid-add-a-judgment-for-ns-null-in-pid_nr_ns.patch -pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch fs-add-initramfs_options-to-set-initramfs-mount-opti.patch cramfs-verify-inode-mode-when-loading-from-disk.patch writeback-avoid-softlockup-when-switching-many-inode.patch diff --git a/queue-6.1/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch b/queue-6.1/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch deleted file mode 100644 index 095135efe6..0000000000 --- a/queue-6.1/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ecf91d0814b73954603515999846941820223193 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 10 Aug 2025 19:36:04 +0200 -Subject: pid: make __task_pid_nr_ns(ns => NULL) safe for zombie callers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Oleg Nesterov - -[ Upstream commit abdfd4948e45c51b19162cf8b3f5003f8f53c9b9 ] - -task_pid_vnr(another_task) will crash if the caller was already reaped. -The pid_alive(current) check can't really help, the parent/debugger can -call release_task() right after this check. - -This also means that even task_ppid_nr_ns(current, NULL) is not safe, -pid_alive() only ensures that it is safe to dereference ->real_parent. - -Change __task_pid_nr_ns() to ensure ns != NULL. - -Originally-by: 高翔 -Link: https://lore.kernel.org/all/20250802022123.3536934-1-gxxa03070307@gmail.com/ -Signed-off-by: Oleg Nesterov -Link: https://lore.kernel.org/20250810173604.GA19991@redhat.com -Signed-off-by: Christian Brauner -Signed-off-by: Sasha Levin ---- - kernel/pid.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kernel/pid.c b/kernel/pid.c -index e1d0c9d952278..62a8349267de1 100644 ---- a/kernel/pid.c -+++ b/kernel/pid.c -@@ -497,7 +497,8 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, - rcu_read_lock(); - if (!ns) - ns = task_active_pid_ns(current); -- nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); -+ if (ns) -+ nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); - rcu_read_unlock(); - - return nr; --- -2.51.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 6e5cae096b..8852ac36d9 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -159,7 +159,6 @@ asm-generic-io.h-skip-trace-helpers-if-rwmmio-events-are-disabled.patch mptcp-pm-in-kernel-usable-client-side-with-c-flag.patch minixfs-verify-inode-mode-when-loading-from-disk.patch pid-add-a-judgment-for-ns-null-in-pid_nr_ns.patch -pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch fs-add-initramfs_options-to-set-initramfs-mount-opti.patch cramfs-verify-inode-mode-when-loading-from-disk.patch writeback-avoid-softlockup-when-switching-many-inode.patch diff --git a/queue-6.12/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch b/queue-6.12/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch deleted file mode 100644 index d9c61ad727..0000000000 --- a/queue-6.12/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d0a57bd87b2bc11529d3849fe657d04b5de485d9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 10 Aug 2025 19:36:04 +0200 -Subject: pid: make __task_pid_nr_ns(ns => NULL) safe for zombie callers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Oleg Nesterov - -[ Upstream commit abdfd4948e45c51b19162cf8b3f5003f8f53c9b9 ] - -task_pid_vnr(another_task) will crash if the caller was already reaped. -The pid_alive(current) check can't really help, the parent/debugger can -call release_task() right after this check. - -This also means that even task_ppid_nr_ns(current, NULL) is not safe, -pid_alive() only ensures that it is safe to dereference ->real_parent. - -Change __task_pid_nr_ns() to ensure ns != NULL. - -Originally-by: 高翔 -Link: https://lore.kernel.org/all/20250802022123.3536934-1-gxxa03070307@gmail.com/ -Signed-off-by: Oleg Nesterov -Link: https://lore.kernel.org/20250810173604.GA19991@redhat.com -Signed-off-by: Christian Brauner -Signed-off-by: Sasha Levin ---- - kernel/pid.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kernel/pid.c b/kernel/pid.c -index b80c3bfb58d07..8fdc3a5f87c7d 100644 ---- a/kernel/pid.c -+++ b/kernel/pid.c -@@ -510,7 +510,8 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, - rcu_read_lock(); - if (!ns) - ns = task_active_pid_ns(current); -- nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); -+ if (ns) -+ nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); - rcu_read_unlock(); - - return nr; --- -2.51.0 - diff --git a/queue-6.12/series b/queue-6.12/series index 3631b9acb5..6c2b625eeb 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -265,7 +265,6 @@ irqchip-sifive-plic-avoid-interrupt-id-0-handling-du.patch copy_file_range-limit-size-if-in-compat-mode.patch minixfs-verify-inode-mode-when-loading-from-disk.patch pid-add-a-judgment-for-ns-null-in-pid_nr_ns.patch -pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch fs-add-initramfs_options-to-set-initramfs-mount-opti.patch cramfs-verify-inode-mode-when-loading-from-disk.patch writeback-avoid-softlockup-when-switching-many-inode.patch diff --git a/queue-6.17/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch b/queue-6.17/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch deleted file mode 100644 index 8b359d7c0c..0000000000 --- a/queue-6.17/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 00e585e46d9e321e24f568a4dc53de36a3dd0735 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 10 Aug 2025 19:36:04 +0200 -Subject: pid: make __task_pid_nr_ns(ns => NULL) safe for zombie callers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Oleg Nesterov - -[ Upstream commit abdfd4948e45c51b19162cf8b3f5003f8f53c9b9 ] - -task_pid_vnr(another_task) will crash if the caller was already reaped. -The pid_alive(current) check can't really help, the parent/debugger can -call release_task() right after this check. - -This also means that even task_ppid_nr_ns(current, NULL) is not safe, -pid_alive() only ensures that it is safe to dereference ->real_parent. - -Change __task_pid_nr_ns() to ensure ns != NULL. - -Originally-by: 高翔 -Link: https://lore.kernel.org/all/20250802022123.3536934-1-gxxa03070307@gmail.com/ -Signed-off-by: Oleg Nesterov -Link: https://lore.kernel.org/20250810173604.GA19991@redhat.com -Signed-off-by: Christian Brauner -Signed-off-by: Sasha Levin ---- - kernel/pid.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kernel/pid.c b/kernel/pid.c -index 296cd04c24bae..2dbcc4dd90cc0 100644 ---- a/kernel/pid.c -+++ b/kernel/pid.c -@@ -514,7 +514,8 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, - rcu_read_lock(); - if (!ns) - ns = task_active_pid_ns(current); -- nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); -+ if (ns) -+ nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); - rcu_read_unlock(); - - return nr; --- -2.51.0 - diff --git a/queue-6.17/series b/queue-6.17/series index 03236441c4..435d674a54 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -358,7 +358,6 @@ irqchip-sifive-plic-avoid-interrupt-id-0-handling-du.patch copy_file_range-limit-size-if-in-compat-mode.patch minixfs-verify-inode-mode-when-loading-from-disk.patch pid-add-a-judgment-for-ns-null-in-pid_nr_ns.patch -pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch fs-add-initramfs_options-to-set-initramfs-mount-opti.patch cramfs-verify-inode-mode-when-loading-from-disk.patch nsfs-validate-extensible-ioctls.patch diff --git a/queue-6.6/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch b/queue-6.6/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch deleted file mode 100644 index 71581b2175..0000000000 --- a/queue-6.6/pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 94ebb937895b3a258a3422b9afee350632d69ff9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 10 Aug 2025 19:36:04 +0200 -Subject: pid: make __task_pid_nr_ns(ns => NULL) safe for zombie callers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Oleg Nesterov - -[ Upstream commit abdfd4948e45c51b19162cf8b3f5003f8f53c9b9 ] - -task_pid_vnr(another_task) will crash if the caller was already reaped. -The pid_alive(current) check can't really help, the parent/debugger can -call release_task() right after this check. - -This also means that even task_ppid_nr_ns(current, NULL) is not safe, -pid_alive() only ensures that it is safe to dereference ->real_parent. - -Change __task_pid_nr_ns() to ensure ns != NULL. - -Originally-by: 高翔 -Link: https://lore.kernel.org/all/20250802022123.3536934-1-gxxa03070307@gmail.com/ -Signed-off-by: Oleg Nesterov -Link: https://lore.kernel.org/20250810173604.GA19991@redhat.com -Signed-off-by: Christian Brauner -Signed-off-by: Sasha Levin ---- - kernel/pid.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kernel/pid.c b/kernel/pid.c -index e57adc00cb779..69922b2e7ed15 100644 ---- a/kernel/pid.c -+++ b/kernel/pid.c -@@ -500,7 +500,8 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, - rcu_read_lock(); - if (!ns) - ns = task_active_pid_ns(current); -- nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); -+ if (ns) -+ nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns); - rcu_read_unlock(); - - return nr; --- -2.51.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 1ed866f633..c542f10d23 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -192,7 +192,6 @@ irqchip-sifive-plic-make-use-of-__assign_bit.patch irqchip-sifive-plic-avoid-interrupt-id-0-handling-du.patch minixfs-verify-inode-mode-when-loading-from-disk.patch pid-add-a-judgment-for-ns-null-in-pid_nr_ns.patch -pid-make-__task_pid_nr_ns-ns-null-safe-for-zombie-ca.patch fs-add-initramfs_options-to-set-initramfs-mount-opti.patch cramfs-verify-inode-mode-when-loading-from-disk.patch writeback-avoid-softlockup-when-switching-many-inode.patch -- 2.47.3