From: Sasha Levin Date: Thu, 17 May 2012 21:31:39 +0000 (+0200) Subject: cred: use correct cred accessor with regards to rcu read lock X-Git-Tag: v3.5-rc1~107^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ca937a668d4be0b0c89c4fc9a912a5885ac06fe;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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: Sasha Levin Signed-off-by: Eric W. Biederman --- diff --git a/kernel/exit.c b/kernel/exit.c index 789e3c5..910a071 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1427,7 +1427,7 @@ static int wait_task_stopped(struct wait_opts *wo, if (!unlikely(wo->wo_flags & WNOWAIT)) *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: spin_unlock_irq(&p->sighand->siglock); 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)) 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); pid = task_pid_vnr(p);