diff options
| author | Andy Lutomirski <luto@amacapital.net> | 2013-04-14 16:28:19 -0700 |
|---|---|---|
| committer | Andy Lutomirski <luto@amacapital.net> | 2013-04-14 18:11:31 -0700 |
| commit | e3211c120a85b792978bcb4be7b2886df18d27f0 (patch) | |
| tree | 6828a385e00925ad5699ad8ca365c6e7311416fc /kernel/user_namespace.c | |
| parent | 6708075f104c3c9b04b23336bb0366ca30c3931b (diff) | |
| download | op-kernel-dev-e3211c120a85b792978bcb4be7b2886df18d27f0.zip op-kernel-dev-e3211c120a85b792978bcb4be7b2886df18d27f0.tar.gz | |
userns: Check uid_map's opener's fsuid, not the current fsuid
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Diffstat (limited to 'kernel/user_namespace.c')
| -rw-r--r-- | kernel/user_namespace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index e2d4ace..5c16f3a 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -797,12 +797,12 @@ static bool new_idmap_permitted(const struct file *file, u32 id = new_map->extent[0].lower_first; if (cap_setid == CAP_SETUID) { kuid_t uid = make_kuid(ns->parent, id); - if (uid_eq(uid, current_fsuid())) + if (uid_eq(uid, file->f_cred->fsuid)) return true; } else if (cap_setid == CAP_SETGID) { kgid_t gid = make_kgid(ns->parent, id); - if (gid_eq(gid, current_fsgid())) + if (gid_eq(gid, file->f_cred->fsgid)) return true; } } |
