Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cred: remove task_is_dead() from __task_cred() validation

Commit 8f92054e7ca1 ("CRED: Fix __task_cred()'s lockdep check and banner
comment"):

add the following validation condition:

task->exit_state >= 0

to permit the access if the target task is dead and therefore
unable to change its own credentials.

OK, but afaics currently this can only help wait_task_zombie() which calls
__task_cred() without rcu lock.

Remove this validation and change wait_task_zombie() to use task_uid()
instead. This means we do rcu_read_lock() only to shut up the lockdep,
but we already do the same in, say, wait_task_stopped().

task_is_dead() should die, task->exit_state != 0 means that this task has
passed exit_notify(), only do_wait-like code paths should use this.

Unfortunately, we can't kill task_is_dead() right now, it has already
acquired buggy users in drivers/staging. The fix already exists.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: David Howells <dhowells@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Oleg Nesterov and committed by
Linus Torvalds
43e13cc1 9b3c98cd

+4 -8
+3 -7
include/linux/cred.h
··· 277 277 * @task: The task to query 278 278 * 279 279 * Access the objective credentials of a task. The caller must hold the RCU 280 - * readlock or the task must be dead and unable to change its own credentials. 280 + * readlock. 281 281 * 282 282 * The result of this function should not be passed directly to get_cred(); 283 283 * rather get_task_cred() should be used instead. 284 284 */ 285 - #define __task_cred(task) \ 286 - ({ \ 287 - const struct task_struct *__t = (task); \ 288 - rcu_dereference_check(__t->real_cred, \ 289 - task_is_dead(__t)); \ 290 - }) 285 + #define __task_cred(task) \ 286 + rcu_dereference((task)->real_cred) 291 287 292 288 /** 293 289 * get_current_cred - Get the current task's subjective credentials
+1 -1
kernel/exit.c
··· 1214 1214 unsigned long state; 1215 1215 int retval, status, traced; 1216 1216 pid_t pid = task_pid_vnr(p); 1217 - uid_t uid = from_kuid_munged(current_user_ns(), __task_cred(p)->uid); 1217 + uid_t uid = from_kuid_munged(current_user_ns(), task_uid(p)); 1218 1218 struct siginfo __user *infop; 1219 1219 1220 1220 if (!likely(wo->wo_flags & WEXITED))