diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2011-06-15 13:21:48 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-20 07:19:49 -0500 |
commit | 98f842e675f96ffac96e6c50315790912b2812be (patch) | |
tree | ed4dee9a6e54e3443e9f3f1614c8a2fcf9b31e0a /kernel/user_namespace.c | |
parent | bf056bfa80596a5d14b26b17276a56a0dcb080e5 (diff) |
proc: Usable inode numbers for the namespace file descriptors.
Assign a unique proc inode to each namespace, and use that
inode number to ensure we only allocate at most one proc
inode for every namespace in proc.
A single proc inode per namespace allows userspace to test
to see if two processes are in the same namespace.
This has been a long requested feature and only blocked because
a naive implementation would put the id in a global space and
would ultimately require having a namespace for the names of
namespaces, making migration and certain virtualization tricks
impossible.
We still don't have per superblock inode numbers for proc, which
appears necessary for application unaware checkpoint/restart and
migrations (if the application is using namespace file descriptors)
but that is now allowd by the design if it becomes important.
I have preallocated the ipc and uts initial proc inode numbers so
their structures can be statically initialized.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'kernel/user_namespace.c')
-rw-r--r-- | kernel/user_namespace.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index 89f6eaed067a..f5975ccf9348 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c | |||
@@ -58,6 +58,7 @@ int create_user_ns(struct cred *new) | |||
58 | struct user_namespace *ns, *parent_ns = new->user_ns; | 58 | struct user_namespace *ns, *parent_ns = new->user_ns; |
59 | kuid_t owner = new->euid; | 59 | kuid_t owner = new->euid; |
60 | kgid_t group = new->egid; | 60 | kgid_t group = new->egid; |
61 | int ret; | ||
61 | 62 | ||
62 | /* The creator needs a mapping in the parent user namespace | 63 | /* The creator needs a mapping in the parent user namespace |
63 | * or else we won't be able to reasonably tell userspace who | 64 | * or else we won't be able to reasonably tell userspace who |
@@ -71,6 +72,12 @@ int create_user_ns(struct cred *new) | |||
71 | if (!ns) | 72 | if (!ns) |
72 | return -ENOMEM; | 73 | return -ENOMEM; |
73 | 74 | ||
75 | ret = proc_alloc_inum(&ns->proc_inum); | ||
76 | if (ret) { | ||
77 | kmem_cache_free(user_ns_cachep, ns); | ||
78 | return ret; | ||
79 | } | ||
80 | |||
74 | kref_init(&ns->kref); | 81 | kref_init(&ns->kref); |
75 | /* Leave the new->user_ns reference with the new user namespace. */ | 82 | /* Leave the new->user_ns reference with the new user namespace. */ |
76 | ns->parent = parent_ns; | 83 | ns->parent = parent_ns; |
@@ -103,6 +110,7 @@ void free_user_ns(struct kref *kref) | |||
103 | container_of(kref, struct user_namespace, kref); | 110 | container_of(kref, struct user_namespace, kref); |
104 | 111 | ||
105 | parent = ns->parent; | 112 | parent = ns->parent; |
113 | proc_free_inum(ns->proc_inum); | ||
106 | kmem_cache_free(user_ns_cachep, ns); | 114 | kmem_cache_free(user_ns_cachep, ns); |
107 | put_user_ns(parent); | 115 | put_user_ns(parent); |
108 | } | 116 | } |
@@ -808,12 +816,19 @@ static int userns_install(struct nsproxy *nsproxy, void *ns) | |||
808 | return commit_creds(cred); | 816 | return commit_creds(cred); |
809 | } | 817 | } |
810 | 818 | ||
819 | static unsigned int userns_inum(void *ns) | ||
820 | { | ||
821 | struct user_namespace *user_ns = ns; | ||
822 | return user_ns->proc_inum; | ||
823 | } | ||
824 | |||
811 | const struct proc_ns_operations userns_operations = { | 825 | const struct proc_ns_operations userns_operations = { |
812 | .name = "user", | 826 | .name = "user", |
813 | .type = CLONE_NEWUSER, | 827 | .type = CLONE_NEWUSER, |
814 | .get = userns_get, | 828 | .get = userns_get, |
815 | .put = userns_put, | 829 | .put = userns_put, |
816 | .install = userns_install, | 830 | .install = userns_install, |
831 | .inum = userns_inum, | ||
817 | }; | 832 | }; |
818 | 833 | ||
819 | static __init int user_namespaces_init(void) | 834 | static __init int user_namespaces_init(void) |