From 72cda3d1ef24ab0a9a89c15e9776ca737b75f45a Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Thu, 9 Feb 2012 09:09:39 -0800 Subject: [PATCH] userns: Convert in_group_p and in_egroup_p to use kgid_t Acked-by: Serge Hallyn Signed-off-by: Eric W. Biederman --- include/linux/cred.h | 4 ++-- kernel/groups.c | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/linux/cred.h b/include/linux/cred.h index fac0579258f..917dc5aeb1d 100644 --- 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 84156f2d4c8..6b2588dd04f 100644 --- 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; }