aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/user_namespace.h
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-07-26 08:15:35 -0400
committerEric W. Biederman <ebiederm@xmission.com>2012-11-20 07:18:14 -0500
commitb2e0d98705e60e45bbb3c0032c48824ad7ae0704 (patch)
treee187c82e1c3babd34095f2b946614131719bbb03 /include/linux/user_namespace.h
parentcde1975bc242f3e1072bde623ef378e547b73f91 (diff)
userns: Implement unshare of the user namespace
- Add CLONE_THREAD to the unshare flags if CLONE_NEWUSER is selected As changing user namespaces is only valid if all there is only a single thread. - Restore the code to add CLONE_VM if CLONE_THREAD is selected and the code to addCLONE_SIGHAND if CLONE_VM is selected. Making the constraints in the code clear. Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'include/linux/user_namespace.h')
-rw-r--r--include/linux/user_namespace.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index 95142cae446a..17651f08d67f 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -39,6 +39,7 @@ static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
39} 39}
40 40
41extern int create_user_ns(struct cred *new); 41extern int create_user_ns(struct cred *new);
42extern int unshare_userns(unsigned long unshare_flags, struct cred **new_cred);
42extern void free_user_ns(struct kref *kref); 43extern void free_user_ns(struct kref *kref);
43 44
44static inline void put_user_ns(struct user_namespace *ns) 45static inline void put_user_ns(struct user_namespace *ns)
@@ -66,6 +67,14 @@ static inline int create_user_ns(struct cred *new)
66 return -EINVAL; 67 return -EINVAL;
67} 68}
68 69
70static inline int unshare_userns(unsigned long unshare_flags,
71 struct cred **new_cred)
72{
73 if (unshare_flags & CLONE_NEWUSER)
74 return -EINVAL;
75 return 0;
76}
77
69static inline void put_user_ns(struct user_namespace *ns) 78static inline void put_user_ns(struct user_namespace *ns)
70{ 79{
71} 80}