From nobody Wed Sep 17 12:19:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRd9Q0xPYz67Hkl; Wed, 17 Sep 2025 12:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRd9Q08Vwz3Vkb; Wed, 17 Sep 2025 12:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAghK0+HcRNoaVtvwc5F/57nLOemNvnMRWc4vqlQG98=; b=ZUOpaW/V/8xFG/gDc9u3vs+UeaKwTMHpN4ldDG13W6PJe++wXwh+pxkioTQqYO791MlrfV Py0JYyBTaXTLcTy1wV3XWCfQcv4RBpyMJGNjucNJGGZGfEZK0jAr4oAsdZwooDYiJr13Vp RxGhMoFFIpI1dkcSRttDvnqqY3D/BjDsA5LiS9kAqr9ScZ6FmbSyuvxKD6BtKQ5RlBeGZc 4adRnSvJwTXz94J1obwTvoW0bRTLlv+Fmsg1V6Eck/NbVgwe2J9Ifn+1CJQtJRH1DUsuB4 HPlpNIfqkzLMoG/0UlNCYpwcGeNvl29iJ0DDk1mHRbU0osMMR/oWdo4LUBYvxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAghK0+HcRNoaVtvwc5F/57nLOemNvnMRWc4vqlQG98=; b=QjmrdFpkGBQVKXrPTq8OqOVSAf/D9aa9zSTWEvFVtGUcFyIAkWmBDreEwwiC5zIMeK5yEf c+eUrYYxisH4ceyZLw2KWwxZluWcLuvOs4xsPTae70UII+mbNppbSzCHG7G0iLZM3S9AXD Wiqos3a9/nAdmJzUlBLEB+zUwegpqD6a+fVZPl1ZbVksrMYOYijFbpJ4NHOHwpsSApIhtA tEO010oWmWfZqWb2B6dFrtnASTEPR2j6YAgXZRhef5ZoLQDLxpT7SIx9CoOft9Xb1W7S3/ +1aDjqMzGcavrTRKIe2j8umGCbXa5Q+ORRPNkLDKZurXRcKQCWKcA4bO+C8W8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758111546; a=rsa-sha256; cv=none; b=hT96nsg0meaCK3mUPB+nLwveE+wWXGlbfa5iejlkV2W7Ia+57jWr7VzxYiHkHUjWgjV3ik bLTGPJm4wdXeQsBnm5hl7YGN1Y+rYHp9yyc70U3ES5BKHqNbvVCK7/u4kebw+wFoPx8HAD JJBMtrvY/OLCv4yhJYBdIQglx59V87p2+8zyDCR41xeFf0c0Jtno4rivFdzaw7yOLXyW+J z+6iS1VrAS9vcDLyWVgolPjFHD3lbbLM+SrDRY73bUosFSrKZM6Ay6wo5h4fTEg/ymgL7I gIWOjKWNZcUp6PziZgl/KVvzouE52pt3asvB1PDrHIAwn9aAnkUB7jS7tclHgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cRd9P6rzvz9G5; Wed, 17 Sep 2025 12:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HCJ5G4085787; Wed, 17 Sep 2025 12:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HCJ5g1085784; Wed, 17 Sep 2025 12:19:05 GMT (envelope-from git) Date: Wed, 17 Sep 2025 12:19:05 GMT Message-Id: <202509171219.58HCJ5g1085784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: f75d0dc53392 - main - cr_canseeothergids(): Make the logic easier to grasp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f75d0dc533923345c653dcdcd5ebd1e53377a7c5 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f75d0dc533923345c653dcdcd5ebd1e53377a7c5 commit f75d0dc533923345c653dcdcd5ebd1e53377a7c5 Author: Olivier Certner AuthorDate: 2025-08-27 16:53:14 +0000 Commit: Olivier Certner CommitDate: 2025-09-17 12:16:03 +0000 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 --- sys/kern/kern_prot.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 6485254d300d..a4c5bcc52529 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -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)) - return (0); + if (see_other_gids) + return (0); - for (int i = 0; i < u1->cr_ngroups; i++) - if (realgroupmember(u1->cr_groups[i], u2)) - return (0); + /* Restriction in force. */ - if (priv_check_cred(u1, PRIV_SEEOTHERGIDS) != 0) - return (ESRCH); - } + if (realgroupmember(u1->cr_rgid, u2)) + return (0); - 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); + + return (ESRCH); } /*