summaryrefslogtreecommitdiffstats
path: root/kernel/user_namespace.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-08-10 19:25:44 -0400
committerEric W. Biederman <ebiederm@xmission.com>2015-08-12 15:55:28 -0400
commitfaf00da544045fdc1454f3b9e6d7f65c841de302 (patch)
treee08a54d870374ea8e0d8421c39f4c90559fd4ab0 /kernel/user_namespace.c
parent12c641ab8270f787dfcce08b5f20ce8b65008096 (diff)
userns,pidns: Force thread group sharing, not signal handler sharing.
The code that places signals in signal queues computes the uids, gids, and pids at the time the signals are enqueued. Which means that tasks that share signal queues must be in the same pid and user namespaces. Sharing signal handlers is fine, but bizarre. So make the code in fork and userns_install clearer by only testing for what is functionally necessary. Also update the comment in unshare about unsharing a user namespace to be a little more explicit and make a little more sense. Acked-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel/user_namespace.c')
-rw-r--r--kernel/user_namespace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 4109f8320684..f65a0a06a8c0 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -976,8 +976,8 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
976 if (user_ns == current_user_ns()) 976 if (user_ns == current_user_ns())
977 return -EINVAL; 977 return -EINVAL;
978 978
979 /* Threaded processes may not enter a different user namespace */ 979 /* Tasks that share a thread group must share a user namespace */
980 if (atomic_read(&current->mm->mm_users) > 1) 980 if (!thread_group_empty(current))
981 return -EINVAL; 981 return -EINVAL;
982 982
983 if (current->fs->users != 1) 983 if (current->fs->users != 1)