Commit-ID: b51b94a599239de4e3cf769e257a7e87928f20be Gitweb: http://git.kernel.org/tip/b51b94a599239de4e3cf769e257a7e87928f20be Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> AuthorDate: Mon, 21 May 2012 17:50:09 +1000 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Wed, 23 May 2012 16:30:55 +0200 sched/numa, userns: Fix user_ns move to 'struct cred' Eliminate obsolete (and to be removed) cred->user-> use. Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx> Link: http://lkml.kernel.org/r/20120521175009.7bd4948c026d8acc61f26753@xxxxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- kernel/sched/numa.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/numa.c b/kernel/sched/numa.c index fdf737d..de66256 100644 --- a/kernel/sched/numa.c +++ b/kernel/sched/numa.c @@ -1268,7 +1268,7 @@ static int ng_allowed(struct numa_group *ng, struct task_struct *p) rcu_read_lock(); tcred = __task_cred(p); - if (cred->user->user_ns == tcred->user->user_ns && + if (cred->user_ns == tcred->user_ns && (cred->uid == tcred->euid && cred->uid == tcred->suid && cred->uid == tcred->uid && @@ -1276,7 +1276,7 @@ static int ng_allowed(struct numa_group *ng, struct task_struct *p) cred->gid == tcred->sgid && cred->gid == tcred->gid)) goto ok; - if (ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE)) + if (ns_capable(tcred->user_ns, CAP_SYS_PTRACE)) goto ok; rcu_read_unlock(); return -EPERM; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|