diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-07-26 07:02:49 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-20 07:17:43 -0500 |
commit | bcf58e725ddc45d31addbc6627d4f0edccc824c1 (patch) | |
tree | e6dff2fbed40f26d8c45f78e23a7476527573bf1 /include/linux/ipc_namespace.h | |
parent | 142e1d1d5f088e7a38659daca6e84a730967774a (diff) |
userns: Make create_new_namespaces take a user_ns parameter
Modify create_new_namespaces to explicitly take a user namespace
parameter, instead of implicitly through the task_struct.
This allows an implementation of unshare(CLONE_NEWUSER) where
the new user namespace is not stored onto the current task_struct
until after all of the namespaces are created.
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'include/linux/ipc_namespace.h')
-rw-r--r-- | include/linux/ipc_namespace.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index 5499c92a9153..f03af702a39d 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h | |||
@@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; } | |||
133 | 133 | ||
134 | #if defined(CONFIG_IPC_NS) | 134 | #if defined(CONFIG_IPC_NS) |
135 | extern struct ipc_namespace *copy_ipcs(unsigned long flags, | 135 | extern struct ipc_namespace *copy_ipcs(unsigned long flags, |
136 | struct task_struct *tsk); | 136 | struct user_namespace *user_ns, struct ipc_namespace *ns); |
137 | |||
137 | static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) | 138 | static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) |
138 | { | 139 | { |
139 | if (ns) | 140 | if (ns) |
@@ -144,12 +145,12 @@ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) | |||
144 | extern void put_ipc_ns(struct ipc_namespace *ns); | 145 | extern void put_ipc_ns(struct ipc_namespace *ns); |
145 | #else | 146 | #else |
146 | static inline struct ipc_namespace *copy_ipcs(unsigned long flags, | 147 | static inline struct ipc_namespace *copy_ipcs(unsigned long flags, |
147 | struct task_struct *tsk) | 148 | struct user_namespace *user_ns, struct ipc_namespace *ns) |
148 | { | 149 | { |
149 | if (flags & CLONE_NEWIPC) | 150 | if (flags & CLONE_NEWIPC) |
150 | return ERR_PTR(-EINVAL); | 151 | return ERR_PTR(-EINVAL); |
151 | 152 | ||
152 | return tsk->nsproxy->ipc_ns; | 153 | return ns; |
153 | } | 154 | } |
154 | 155 | ||
155 | static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) | 156 | static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) |