From 269c9aedb128cf594da65590b58f4f4551c341d3 Mon Sep 17 00:00:00 2001 From: Andy Lutomirski Date: Sun, 14 Apr 2013 16:28:19 -0700 Subject: [PATCH] --- yaml --- r: 362610 b: refs/heads/master c: e3211c120a85b792978bcb4be7b2886df18d27f0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/user_namespace.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 65cfe81e8eba..ab4a9dc2acd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6708075f104c3c9b04b23336bb0366ca30c3931b +refs/heads/master: e3211c120a85b792978bcb4be7b2886df18d27f0 diff --git a/trunk/kernel/user_namespace.c b/trunk/kernel/user_namespace.c index e2d4ace4481b..5c16f3aa757a 100644 --- a/trunk/kernel/user_namespace.c +++ b/trunk/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; } }