Commit e3211c12 authored by Andy Lutomirski's avatar Andy Lutomirski

userns: Check uid_map's opener's fsuid, not the current fsuid

Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
parent 6708075f
...@@ -797,12 +797,12 @@ static bool new_idmap_permitted(const struct file *file, ...@@ -797,12 +797,12 @@ static bool new_idmap_permitted(const struct file *file,
u32 id = new_map->extent[0].lower_first; u32 id = new_map->extent[0].lower_first;
if (cap_setid == CAP_SETUID) { if (cap_setid == CAP_SETUID) {
kuid_t uid = make_kuid(ns->parent, id); kuid_t uid = make_kuid(ns->parent, id);
if (uid_eq(uid, current_fsuid())) if (uid_eq(uid, file->f_cred->fsuid))
return true; return true;
} }
else if (cap_setid == CAP_SETGID) { else if (cap_setid == CAP_SETGID) {
kgid_t gid = make_kgid(ns->parent, id); kgid_t gid = make_kgid(ns->parent, id);
if (gid_eq(gid, current_fsgid())) if (gid_eq(gid, file->f_cred->fsgid))
return true; return true;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment