]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pid: make __task_pid_nr_ns(ns => NULL) safe for zombie callers
authorOleg Nesterov <oleg@redhat.com>
Sun, 10 Aug 2025 17:36:04 +0000 (19:36 +0200)
committerChristian Brauner <brauner@kernel.org>
Tue, 19 Aug 2025 11:38:20 +0000 (13:38 +0200)
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: 高翔 <gaoxiang17@xiaomi.com>
Link: https://lore.kernel.org/all/20250802022123.3536934-1-gxxa03070307@gmail.com/
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Link: https://lore.kernel.org/20250810173604.GA19991@redhat.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
kernel/pid.c

index 14e908f2f0cbfbf94af45fd0f53a8d113e74ad27..f62a7df2f04cf79922926104cea04f54bbd513b6 100644 (file)
@@ -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;