lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cred: use correct cred accessor with regards to rcu read lock

Browse Source 
Commit "userns: Convert setting and getting uid and gid system calls to use
kuid and kgid has modified the accessors in wait_task_continued() and
wait_task_stopped() to use __task_cred() instead of task_uid().

__task_cred() assumes that we're inside a rcu read lock, which is untrue
for these two functions.

Modify it to use task_uid() instead.

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Sasha Levin
2012-05-17 23:31:39 +02:00
committed by Eric W. Biederman
parent b38a86eb19
commit 8ca937a668
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/exit.c
View File

@@ -1427,7 +1427,7 @@ static int wait_task_stopped(struct wait_opts *wo,
if (!unlikely(wo->wo_flags & WNOWAIT)) if (!unlikely(wo->wo_flags & WNOWAIT))
*p_code = 0; *p_code = 0;
uid = from_kuid_munged(current_user_ns(), __task_cred(p)->uid); uid = from_kuid_munged(current_user_ns(), task_uid(p));
unlock_sig: unlock_sig:
spin_unlock_irq(&p->sighand->siglock); spin_unlock_irq(&p->sighand->siglock);
if (!exit_code) if (!exit_code)
@@ -1500,7 +1500,7 @@ static int wait_task_continued(struct wait_opts *wo, struct task_struct *p)
} }
if (!unlikely(wo->wo_flags & WNOWAIT)) if (!unlikely(wo->wo_flags & WNOWAIT))
p->signal->flags &= ~SIGNAL_STOP_CONTINUED; p->signal->flags &= ~SIGNAL_STOP_CONTINUED;
uid = from_kuid_munged(current_user_ns(), __task_cred(p)->uid); uid = from_kuid_munged(current_user_ns(), task_uid(p));
spin_unlock_irq(&p->sighand->siglock); spin_unlock_irq(&p->sighand->siglock);
pid = task_pid_vnr(p); pid = task_pid_vnr(p);