diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2008-02-08 07:18:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:24 -0500 |
commit | df5f8314ca30d6a76735748e5ba4ca9809c0f434 (patch) | |
tree | e0a6157b1666a320e69586a81c77a3fe83b36a2a /fs/proc/base.c | |
parent | a56d3fc74c0178c5f41c48315604d62cff4e746d (diff) |
proc: seqfile convert proc_pid_status to properly handle pid namespaces
Currently we possibly lookup the pid in the wrong pid namespace. So
seq_file convert proc_pid_status which ensures the proper pid namespaces is
passed in.
[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: another build fix]
[akpm@linux-foundation.org: s390 build fix]
[akpm@linux-foundation.org: fix task_name() output]
[akpm@linux-foundation.org: fix nommu build]
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Andrew Morgan <morgan@kernel.org>
Cc: Serge Hallyn <serue@us.ibm.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: Paul Jackson <pj@sgi.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc/base.c')
-rw-r--r-- | fs/proc/base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 9c3e548a6754..8a19a8a1a3e6 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -2274,7 +2274,7 @@ static const struct pid_entry tgid_base_stuff[] = { | |||
2274 | DIR("fdinfo", S_IRUSR|S_IXUSR, fdinfo), | 2274 | DIR("fdinfo", S_IRUSR|S_IXUSR, fdinfo), |
2275 | REG("environ", S_IRUSR, environ), | 2275 | REG("environ", S_IRUSR, environ), |
2276 | INF("auxv", S_IRUSR, pid_auxv), | 2276 | INF("auxv", S_IRUSR, pid_auxv), |
2277 | INF("status", S_IRUGO, pid_status), | 2277 | ONE("status", S_IRUGO, pid_status), |
2278 | INF("limits", S_IRUSR, pid_limits), | 2278 | INF("limits", S_IRUSR, pid_limits), |
2279 | #ifdef CONFIG_SCHED_DEBUG | 2279 | #ifdef CONFIG_SCHED_DEBUG |
2280 | REG("sched", S_IRUGO|S_IWUSR, pid_sched), | 2280 | REG("sched", S_IRUGO|S_IWUSR, pid_sched), |
@@ -2605,7 +2605,7 @@ static const struct pid_entry tid_base_stuff[] = { | |||
2605 | DIR("fdinfo", S_IRUSR|S_IXUSR, fdinfo), | 2605 | DIR("fdinfo", S_IRUSR|S_IXUSR, fdinfo), |
2606 | REG("environ", S_IRUSR, environ), | 2606 | REG("environ", S_IRUSR, environ), |
2607 | INF("auxv", S_IRUSR, pid_auxv), | 2607 | INF("auxv", S_IRUSR, pid_auxv), |
2608 | INF("status", S_IRUGO, pid_status), | 2608 | ONE("status", S_IRUGO, pid_status), |
2609 | INF("limits", S_IRUSR, pid_limits), | 2609 | INF("limits", S_IRUSR, pid_limits), |
2610 | #ifdef CONFIG_SCHED_DEBUG | 2610 | #ifdef CONFIG_SCHED_DEBUG |
2611 | REG("sched", S_IRUGO|S_IWUSR, pid_sched), | 2611 | REG("sched", S_IRUGO|S_IWUSR, pid_sched), |