diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-09 11:48:21 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-15 17:59:28 -0400 |
commit | dcb0f22282e680ee5202ab7574ce78beb3803a9f (patch) | |
tree | dce64929607bc1cc79b08e9c207c27792988ff39 /fs/proc/array.c | |
parent | 08cefc7ab839cf3ece44b8033968a4732eac06d8 (diff) |
userns: Convert proc to use kuid/kgid where appropriate
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 36a0a9192ece..dc4c5a7b9ece 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
@@ -191,8 +191,14 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns, | |||
191 | task_tgid_nr_ns(p, ns), | 191 | task_tgid_nr_ns(p, ns), |
192 | pid_nr_ns(pid, ns), | 192 | pid_nr_ns(pid, ns), |
193 | ppid, tpid, | 193 | ppid, tpid, |
194 | cred->uid, cred->euid, cred->suid, cred->fsuid, | 194 | from_kuid_munged(user_ns, cred->uid), |
195 | cred->gid, cred->egid, cred->sgid, cred->fsgid); | 195 | from_kuid_munged(user_ns, cred->euid), |
196 | from_kuid_munged(user_ns, cred->suid), | ||
197 | from_kuid_munged(user_ns, cred->fsuid), | ||
198 | from_kgid_munged(user_ns, cred->gid), | ||
199 | from_kgid_munged(user_ns, cred->egid), | ||
200 | from_kgid_munged(user_ns, cred->sgid), | ||
201 | from_kgid_munged(user_ns, cred->fsgid)); | ||
196 | 202 | ||
197 | task_lock(p); | 203 | task_lock(p); |
198 | if (p->files) | 204 | if (p->files) |