Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72cda3d1 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

userns: Convert in_group_p and in_egroup_p to use kgid_t 



Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 92361636

include/linux/cred.h

+2 −2
Original line number Diff line number Diff line
@@ -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

kernel/groups.c

+6 −8
Original line number Diff line number Diff line
@@ -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;

}