diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-07-26 05:15:35 -0700 | 
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-20 04:18:14 -0800 | 
| commit | b2e0d98705e60e45bbb3c0032c48824ad7ae0704 (patch) | |
| tree | e187c82e1c3babd34095f2b946614131719bbb03 /include/linux/user_namespace.h | |
| parent | cde1975bc242f3e1072bde623ef378e547b73f91 (diff) | |
| download | olio-linux-3.10-b2e0d98705e60e45bbb3c0032c48824ad7ae0704.tar.xz olio-linux-3.10-b2e0d98705e60e45bbb3c0032c48824ad7ae0704.zip  | |
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.h | 9 | 
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index 95142cae446..17651f08d67 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)  }  extern int create_user_ns(struct cred *new); +extern int unshare_userns(unsigned long unshare_flags, struct cred **new_cred);  extern void free_user_ns(struct kref *kref);  static inline void put_user_ns(struct user_namespace *ns) @@ -66,6 +67,14 @@ static inline int create_user_ns(struct cred *new)  	return -EINVAL;  } +static inline int unshare_userns(unsigned long unshare_flags, +				 struct cred **new_cred) +{ +	if (unshare_flags & CLONE_NEWUSER) +		return -EINVAL; +	return 0; +} +  static inline void put_user_ns(struct user_namespace *ns)  {  }  |