Commit 8ca937a6 authored by Sasha Levin's avatar Sasha Levin Committed by Eric W. Biederman

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

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: default avatarSasha Levin <levinsasha928@gmail.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent b38a86eb
...@@ -1427,7 +1427,7 @@ static int wait_task_stopped(struct wait_opts *wo, ...@@ -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) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment