summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-10 21:24:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-10 21:24:59 -0700
commit155134fef2b6c7426c3f25ffe84fb3043167c860 (patch)
tree15caf4a9c0e359002f8771a8cdb60ee2c19578fd
parent58d08e3b2c2033354b91467da33deffa06360c28 (diff)
downloadop-kernel-dev-155134fef2b6c7426c3f25ffe84fb3043167c860.zip
op-kernel-dev-155134fef2b6c7426c3f25ffe84fb3043167c860.tar.gz
Revert "proc: Point /proc/{mounts,net} at /proc/thread-self/{mounts,net} instead of /proc/self/{mounts,net}"
This reverts commits 344470cac42e and e81324407269. It turns out that the exact path in the symlink matters, if for somewhat unfortunate reasons: some apparmor configurations don't allow dhclient access to the per-thread /proc files. As reported by Jörg Otte: audit: type=1400 audit(1407684227.003:28): apparmor="DENIED" operation="open" profile="/sbin/dhclient" name="/proc/1540/task/1540/net/dev" pid=1540 comm="dhclient" requested_mask="r" denied_mask="r" fsuid=0 ouid=0 so we had better revert this for now. We might be able to work around this in practice by only using the per-thread symlinks if the thread isn't the thread group leader, and if the namespaces differ between threads (which basically never happens). We'll see. In the meantime, the revert was made to be intentionally easy. Reported-by: Jörg Otte <jrg.otte@gmail.com> Acked-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/proc/proc_net.c2
-rw-r--r--fs/proc/root.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index 3948102..a63af3e 100644
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -226,7 +226,7 @@ static struct pernet_operations __net_initdata proc_net_ns_ops = {
int __init proc_net_init(void)
{
- proc_symlink("net", NULL, "thread-self/net");
+ proc_symlink("net", NULL, "self/net");
return register_pernet_subsys(&proc_net_ns_ops);
}
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 6296c76..094e44d 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -173,7 +173,7 @@ void __init proc_root_init(void)
proc_self_init();
proc_thread_self_init();
- proc_symlink("mounts", NULL, "thread-self/mounts");
+ proc_symlink("mounts", NULL, "self/mounts");
proc_net_init();
OpenPOWER on IntegriCloud