/proc/iomem: only expose physical resource addresses to privileged users
In commit c4004b02f8
("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>
This commit is contained in:
Родитель
ab0fa82b2d
Коммит
51d7b12041
|
@ -105,16 +105,25 @@ static int r_show(struct seq_file *m, void *v)
|
||||||
{
|
{
|
||||||
struct resource *root = m->private;
|
struct resource *root = m->private;
|
||||||
struct resource *r = v, *p;
|
struct resource *r = v, *p;
|
||||||
|
unsigned long long start, end;
|
||||||
int width = root->end < 0x10000 ? 4 : 8;
|
int width = root->end < 0x10000 ? 4 : 8;
|
||||||
int depth;
|
int depth;
|
||||||
|
|
||||||
for (depth = 0, p = r; depth < MAX_IORES_LEVEL; depth++, p = p->parent)
|
for (depth = 0, p = r; depth < MAX_IORES_LEVEL; depth++, p = p->parent)
|
||||||
if (p->parent == root)
|
if (p->parent == root)
|
||||||
break;
|
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",
|
seq_printf(m, "%*s%0*llx-%0*llx : %s\n",
|
||||||
depth * 2, "",
|
depth * 2, "",
|
||||||
width, (unsigned long long) r->start,
|
width, start,
|
||||||
width, (unsigned long long) r->end,
|
width, end,
|
||||||
r->name ? r->name : "<BAD>");
|
r->name ? r->name : "<BAD>");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче