cr_canseeothergids(): Make the logic easier to grasp

Invert the initial test on whether the policy is in force so that, if
there are no restrictions, the function bails out early, allowing to
de-indent the rest of the code and have it finish with a non-zero (deny)
'return'.

No functional change (intended).

MFC after:      5 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D52272
This commit is contained in:
Olivier Certner
2025-08-27 18:53:14 +02:00
parent d39756f23f
commit f75d0dc533
+13 -10
View File
@@ -1885,19 +1885,22 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_other_gids, CTLFLAG_RW,
static int
cr_canseeothergids(struct ucred *u1, struct ucred *u2)
{
if (!see_other_gids) {
if (realgroupmember(u1->cr_rgid, u2))
if (see_other_gids)
return (0);
/* Restriction in force. */
if (realgroupmember(u1->cr_rgid, u2))
return (0);
for (int i = 0; i < u1->cr_ngroups; i++)
if (realgroupmember(u1->cr_groups[i], u2))
return (0);
for (int i = 0; i < u1->cr_ngroups; i++)
if (realgroupmember(u1->cr_groups[i], u2))
return (0);
if (priv_check_cred(u1, PRIV_SEEOTHERGIDS) == 0)
return (0);
if (priv_check_cred(u1, PRIV_SEEOTHERGIDS) != 0)
return (ESRCH);
}
return (0);
return (ESRCH);
}
/*