From nobody Tue Sep 23 12:03:37 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 4cWJXp5BZfz68Xh6; Tue, 23 Sep 2025 12:03:38 +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 4cWJXn6vMqz3Dkr; Tue, 23 Sep 2025 12:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629018; 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=zQbtyMelWPOYHcqTfnB6hxFO2xY1Z2hPmyCsXStjHcE=; b=fv8+rCqGcx1vy0eRWFbtf7iC69QH+5CzjIRG1roVmeHqGwvMN3bseckkNas8cnas9be37R aelcLAQt+CV9jQ1TKkSQNQPsw+QvOaDWyO3DF+sm1XtyO5hdyEGPSRRjVFyNGHJdNgVdfc xJke5E+3PC83xJbXK3cJRUb/NPQxNsZUUv+83KvHKcG1AbARN7MBHQKhDLOgVCDEoA5dXM iVgv7fB0Q4G/kM9nfHgOwR36CUft5N5xzn4L5tr/jNu2sLn2aCDkMHev0EpLFmU/f9nE/e TdI/8G/wserT9qXvfhjQ133VAgvIIa09AxevQnQsOisA+h0i55qDE/5kWqYlrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629018; 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=zQbtyMelWPOYHcqTfnB6hxFO2xY1Z2hPmyCsXStjHcE=; b=bYT54zHCzM7ENJMIz/Fur4ZVJG0g9Z4vt9WdlPEfdYaPzUantjllaw4zYVS8ngg36f5a9v 3I2EJVFcZVDu0zvu9TphC6WVboFzZHtM3QxNu8Dwq18giOLcORHrQz+XcwSz/aqciOUcI/ /H3s9Cbt56JECInZeOhp+jjgml3P+R8OVVs46GxNUJ7mqB/xOC2EteewUtjHPMGQS/nqrg OpS1XrIstA9bJt49BefluqcIHXfIieLfTkqTOs6l0HhyArFVHuJ3aInERdUZln+AbsksaW FLjVVw0lKRsNzxQYdXGE28I9BtyqMmLnAiYMCYTFIQJFmRXPJXnpfch6rd4DSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758629018; a=rsa-sha256; cv=none; b=FloNLRe9beFIESZg3YQi/ufutPWafjhbxSirG5LQXhSVKE+7cuZ5ehapxKS9+rzaQjV1QU GfR9ZNziSw9J1pQo80p/WL47Loyeh4RW49lcHFvxis1EWPjaHixPtYb2tlBl8VgwNs3STX Kxf5Hl9O3iaigsIWWzwI0yVUre4ELXugScIJxSTxUw7LK18iareP0ey+F5OhvTMNaTLb1D m+0I0vMhDYwfEjzbB+liye4JTImTOda0RYM1s6+OSolpwpD6xgMNig97Wmi8aTwa/tWw9l TduOy+zi7ss8dAdKeLa618lY630npb1a9LKzG/pzeFEmfNkPvRnocCTEa4Nx1g== 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 4cWJXn6QqRzlxG; Tue, 23 Sep 2025 12:03:37 +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 58NC3bS7008585; Tue, 23 Sep 2025 12:03:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NC3bHs008582; Tue, 23 Sep 2025 12:03:37 GMT (envelope-from git) Date: Tue, 23 Sep 2025 12:03:37 GMT Message-Id: <202509231203.58NC3bHs008582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 7bab0263aafe - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 7bab0263aafef686e8ca22e28bb0604cf9372f5d Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7bab0263aafef686e8ca22e28bb0604cf9372f5d commit 7bab0263aafef686e8ca22e28bb0604cf9372f5d Author: Olivier Certner AuthorDate: 2025-08-27 16:53:14 +0000 Commit: Olivier Certner CommitDate: 2025-09-23 12:02:43 +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 (cherry picked from commit f75d0dc533923345c653dcdcd5ebd1e53377a7c5) --- 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); } /*