diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-12-05 19:36:04 -0600 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-01-07 17:55:14 +0100 |
| commit | 90aca415b2917dbb16512b5299f0d5118cf0748c (patch) | |
| tree | 0ff287cb4cbb7273ec001f2673dd5bd5217bd96e /kernel | |
| parent | 84c4e718c006d4e37e1d0a8d1928dd80927e1127 (diff) | |
| download | lwn-90aca415b2917dbb16512b5299f0d5118cf0748c.tar.gz lwn-90aca415b2917dbb16512b5299f0d5118cf0748c.zip | |
userns: Allow setting gid_maps without privilege when setgroups is disabled
commit 66d2f338ee4c449396b6f99f5e75cd18eb6df272 upstream.
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.
Reviewed-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/user_namespace.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index 7737b3da335c..c09fe8b87cb0 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -812,6 +812,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; } } |