userns: Convert in_group_p and in_egroup_p to use kgid_t

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/include/linux/cred.h b/include/linux/cred.h
index fac0579258fcd3e1921fde9273f59075818f37b9..917dc5aeb1d4de6eff77341bc55c67df68c77fb6 100644 (file)
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -73,8 +73,8 @@ extern int groups_search(const struct group_info *, kgid_t);
 #define GROUP_AT(gi, i) \
        ((gi)->blocks[(i) / NGROUPS_PER_BLOCK][(i) % NGROUPS_PER_BLOCK])
 
-extern int in_group_p(gid_t);
-extern int in_egroup_p(gid_t);
+extern int in_group_p(kgid_t);
+extern int in_egroup_p(kgid_t);
 
 /*
  * The common credentials for a thread group

diff --git a/kernel/groups.c b/kernel/groups.c
index 84156f2d4c8c39b64a3d707b836340627307098d..6b2588dd04ff20fb89995394f9c530a2613fbb83 100644 (file)
--- a/kernel/groups.c
+++ b/kernel/groups.c
@@ -256,27 +256,25 @@ SYSCALL_DEFINE2(setgroups, int, gidsetsize, gid_t __user *, grouplist)
 /*
  * Check whether we're fsgid/egid or in the supplemental group..
  */
-int in_group_p(gid_t grp)
+int in_group_p(kgid_t grp)
 {
        const struct cred *cred = current_cred();
        int retval = 1;
 
-       if (grp != cred->fsgid)
-               retval = groups_search(cred->group_info,
-                                      make_kgid(cred->user_ns, grp));
+       if (!gid_eq(grp, cred->fsgid))
+               retval = groups_search(cred->group_info, grp);
        return retval;
 }
 
 EXPORT_SYMBOL(in_group_p);
 
-int in_egroup_p(gid_t grp)
+int in_egroup_p(kgid_t grp)
 {
        const struct cred *cred = current_cred();
        int retval = 1;
 
-       if (grp != cred->egid)
-               retval = groups_search(cred->group_info,
-                                      make_kgid(cred->user_ns, grp));
+       if (!gid_eq(grp, cred->egid))
+               retval = groups_search(cred->group_info, grp);
        return retval;
 }