summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-12-05 19:36:04 -0600
committerEric W. Biederman <ebiederm@xmission.com>2014-12-11 18:07:06 -0600
commit66d2f338ee4c449396b6f99f5e75cd18eb6df272 (patch)
tree6ee765ac11630eb41207b1b4f4202c4d602fa459 /kernel
parent9cc46516ddf497ea16e8d7cb986ae03a0f6b92f8 (diff)
downloadop-kernel-dev-66d2f338ee4c449396b6f99f5e75cd18eb6df272.zip
op-kernel-dev-66d2f338ee4c449396b6f99f5e75cd18eb6df272.tar.gz
userns: Allow setting gid_maps without privilege when setgroups is disabled
Now that setgroups can be disabled and not reenabled, setting gid_map without privielge can now be enabled when setgroups is disabled. This restores most of the functionality that was lost when unprivileged setting of gid_map was removed. Applications that use this functionality will need to check to see if they use setgroups or init_groups, and if they don't they can be fixed by simply disabling setgroups before writing to gid_map. Cc: stable@vger.kernel.org Reviewed-by: Andy Lutomirski <luto@amacapital.net> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/user_namespace.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 6e80f4c..a2e37c5d 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -826,6 +826,11 @@ static bool new_idmap_permitted(const struct file *file,
kuid_t uid = make_kuid(ns->parent, id);
if (uid_eq(uid, cred->euid))
return true;
+ } else if (cap_setid == CAP_SETGID) {
+ kgid_t gid = make_kgid(ns->parent, id);
+ if (!(ns->flags & USERNS_SETGROUPS_ALLOWED) &&
+ gid_eq(gid, cred->egid))
+ return true;
}
}
OpenPOWER on IntegriCloud