]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
release_task: kill unnecessary rcu_read_lock() around dec_rlimit_ucounts()
authorOleg Nesterov <oleg@redhat.com>
Sun, 26 Oct 2025 14:31:40 +0000 (15:31 +0100)
committerAndrew Morton <akpm@linux-foundation.org>
Wed, 12 Nov 2025 18:00:17 +0000 (10:00 -0800)
rcu_read_lock() was added to shut RCU-lockdep up when this code used
__task_cred()->rcu_dereference(), but after the commit 21d1c5e386bc
("Reimplement RLIMIT_NPROC on top of ucounts") it is no longer needed:
task_ucounts()->task_cred_xxx() takes rcu_read_lock() itself.

NOTE: task_ucounts() returns the pointer to another rcu-protected data,
struct ucounts.  So it should either be used when task->real_cred and thus
task->real_cred->ucounts is stable (release_task, copy_process,
copy_creds), or it should be called under rcu_read_lock().  In both cases
it is pointless to take rcu_read_lock() to read the cred->ucounts pointer.

Link: https://lkml.kernel.org/r/20251026143140.GA22463@redhat.com
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Alexey Gladkov <legion@kernel.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Mateusz Guzik <mjguzik@gmail.com>
Cc: "Paul E . McKenney" <paulmck@kernel.org>
Cc: Kees Cook <kees@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
kernel/exit.c

index 9f74e8f1c431b6aa6e391ff71aadf9895a3857ae..f041f0c05ebbf6dad0a9edaaf1bb9654deb2cd60 100644 (file)
@@ -251,10 +251,8 @@ repeat:
        memset(&post, 0, sizeof(post));
 
        /* don't need to get the RCU readlock here - the process is dead and
-        * can't be modifying its own credentials. But shut RCU-lockdep up */
-       rcu_read_lock();
+        * can't be modifying its own credentials. */
        dec_rlimit_ucounts(task_ucounts(p), UCOUNT_RLIMIT_NPROC, 1);
-       rcu_read_unlock();
 
        pidfs_exit(p);
        cgroup_release(p);