summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-14 12:05:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-14 12:56:09 -0700
commit51d7b120418e99d6b3bf8df9eb3cc31e8171dee4 (patch)
treed8fb1817068df408e6a009df9050159aebdd95c4
parentab0fa82b2df96ddadb327ac39f26b5d80cb3d104 (diff)
downloadlinux-51d7b120418e99d6b3bf8df9eb3cc31e8171dee4.tar.gz
linux-51d7b120418e99d6b3bf8df9eb3cc31e8171dee4.tar.bz2
linux-51d7b120418e99d6b3bf8df9eb3cc31e8171dee4.zip
/proc/iomem: only expose physical resource addresses to privileged users
In commit c4004b02f8e5b ("x86: remove the kernel code/data/bss resources from /proc/iomem") I was hoping to remove the phyiscal kernel address data from /proc/iomem entirely, but that had to be reverted because some system programs actually use it. This limits all the detailed resource information to properly credentialed users instead. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/resource.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/kernel/resource.c b/kernel/resource.c
index 2e78ead30934..9b5f04404152 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -105,16 +105,25 @@ static int r_show(struct seq_file *m, void *v)
{
struct resource *root = m->private;
struct resource *r = v, *p;
+ unsigned long long start, end;
int width = root->end < 0x10000 ? 4 : 8;
int depth;
for (depth = 0, p = r; depth < MAX_IORES_LEVEL; depth++, p = p->parent)
if (p->parent == root)
break;
+
+ if (file_ns_capable(m->file, &init_user_ns, CAP_SYS_ADMIN)) {
+ start = r->start;
+ end = r->end;
+ } else {
+ start = end = 0;
+ }
+
seq_printf(m, "%*s%0*llx-%0*llx : %s\n",
depth * 2, "",
- width, (unsigned long long) r->start,
- width, (unsigned long long) r->end,
+ width, start,
+ width, end,
r->name ? r->name : "<BAD>");
return 0;
}