upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 01:30:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

groupmember(): Extract the supplementary group search in a separate function

Browse source 
This is in preparation for the introduction of the new realgroupmember()
function, which does the same search into supplementary groups as
groupmember().

Reviewed by:            mhorne
MFC after:              2 weeks
Sponsored by:           Kumacom SAS
Differential Revision:  https://reviews.freebsd.org/D40640

(cherry picked from commit b725f232f3)
This commit is contained in:
Olivier Certner 2023-08-18 01:54:44 +02:00 committed by Mitchell Horne
parent 8d935c419f
commit f3de805ace
1 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
sys/kern/kern_prot.c
View file

@ -1273,36 +1273,43 @@ sys___setugid(struct thread *td, struct __setugid_args *uap)
}
/*
* Check if gid is a member of the group set.
* Returns whether gid designates a supplementary group in cred.
*/
static int
supplementary_group_member(gid_t gid, struct ucred *cred)
{
int l, h, m;
/*
* Perform a binary search of the supplemental groups. This is possible
* because we sort the groups in crsetgroups().
*/
l = 1;
h = cred->cr_ngroups;
while (l < h) {
m = l + (h - l) / 2;
if (cred->cr_groups[m] < gid)
l = m + 1;
else
h = m;
}
return (l < cred->cr_ngroups && cred->cr_groups[l] == gid);
}
/*
* Check if gid is a member of the (effective) group set (i.e., effective and
* supplementary groups).
*/
int
groupmember(gid_t gid, struct ucred *cred)
{
int l;
int h;
int m;
if (cred->cr_groups[0] == gid)
return(1);
/*
* If gid was not our primary group, perform a binary search
* of the supplemental groups. This is possible because we
* sort the groups in crsetgroups().
*/
l = 1;
h = cred->cr_ngroups;
while (l < h) {
m = l + ((h - l) / 2);
if (cred->cr_groups[m] < gid)
l = m + 1;
else
h = m;
}
if ((l < cred->cr_ngroups) && (cred->cr_groups[l] == gid))
return (1);
return (0);
return (supplementary_group_member(gid, cred));
}
/*