From nobody Wed Sep 17 12:19:01 2025 X-Original-To: dev-commits-src-main@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 4cRd9K6Rtsz67HkW; Wed, 17 Sep 2025 12:19:01 +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 4cRd9K4PHbz3VZV; Wed, 17 Sep 2025 12:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111541; 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=i5NOZCmyjCRVCP+YjQ/8UfXa2pso0Zyj3uQIn82n0Ck=; b=qA4J2gBNdUFpyOfNvfZcJ2fog8ibg0N5433KxRDEslVMxaJTX41xk9aLfBB68QkJhk1IZx VCTI6JuoFOf0YYpE1zxP2y2dDMEQdvku2is5eyEvwUwUS4d4t0sVTa2HuDf8+A81JQ9zCO jieOFZKKNcVxxfBAxtxOSZSJDhsmmP879Fkoq2brWXiIbn+C9BqVAeLyFgSayvNsOvsJYt UUhuk5qBdLdkPVhQYPPxdGB/+MMOopH0BYhhArJ4qsENmjnGuKpqMjXWHgOtxBnF9OGY4p BX3XlPp6u6Sgip0Mm85BDB4NyvE1ZS3w86bLSKQDNfwLd6mPA0YDQ78xnOGDlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111541; 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=i5NOZCmyjCRVCP+YjQ/8UfXa2pso0Zyj3uQIn82n0Ck=; b=jtYHvKn1ctEJHCR+AFg1/ZTuT/qXwdloyI9eSLwhwhXfDf0/pMCT0mbK8J98/9WHOqw0kx 0oJjr3AobOSSf478UNqQgIjH61lLZOhkwVucsRmp1Vh26xjwxucZrN6oKxYSJXB5Hbgjod sm2DZmS5LyzGfPJ8Yns3N7Mkjp4sel6hPwt526fmn2eoDLSzaisf84hkF2ShwscENH2XFW NWtpt6DiNNape2uJhI4xzmJJvJuq/VsVL7qaJNLLMq+pTS1L2CEd/WEa3HfE3/MXRxaV2t nZztF5Yawn09Lh5dTL1iGL3ukTIbebzVCdjGhDdsmtSJJHRIKC4V3rPzwLtRzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758111541; a=rsa-sha256; cv=none; b=uuWBmDpxSiaaIWjgTe1yMpKRpMp6khwgmqIWMxnagvg4WWaOM77rmZ9hrouQOIE/wcctUW i4Kd5N4mMUG4I2Ylhh/ucsT05ObJQX6cMXluFIEbB7YyDtlD0gA7bnrKXrHrd8tJpY1Sdw wgb0O5uYRLfsBOFXVtFqcEjVWd0ewKvs8tKvbMar4EkSqBcdBXc+mKo4X8U0tz3GtKMs5V kLCIhvcywmq4Xw4mm6hC9pGYUcQ2fGBsMkmLx2wvmVilq21ElSQksxp8RQO5wyrypUo0yU Am4PIOuOnKwThPuKo63SKpqdYt7/nI0zOhN/hxJGKbSWZm/BcgTn1hN1ZCPdzw== 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 4cRd9K3l2Tz9hM; Wed, 17 Sep 2025 12:19:01 +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 58HCJ1cw085635; Wed, 17 Sep 2025 12:19:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HCJ1BT085632; Wed, 17 Sep 2025 12:19:01 GMT (envelope-from git) Date: Wed, 17 Sep 2025 12:19:01 GMT Message-Id: <202509171219.58HCJ1BT085632@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: fa1cbb02d120 - main - cred: Restore proper checking of effective groups in some security policies List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: fa1cbb02d12055db0584882d586658be643f0949 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=fa1cbb02d12055db0584882d586658be643f0949 commit fa1cbb02d12055db0584882d586658be643f0949 Author: Olivier Certner AuthorDate: 2025-08-27 14:28:15 +0000 Commit: Olivier Certner CommitDate: 2025-09-17 12:16:02 +0000 cred: Restore proper checking of effective groups in some security policies The removal of 'cr_gid' from cr_groups[] as cr_groups[0] made cr_canseeothergids() skip considering the subject's first supplementary group, causing the 'security.bsd.see_other_gids' policy to be too restrictive, and cr_xids_subset() miss a check on the effective GID, relaxing the "can debug" and "can export KTLS keys" checks. Fix these policies. Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 5 days MFC to: stable/15 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52268 --- sys/kern/kern_prot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 591994e92e7d..6485254d300d 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1889,7 +1889,7 @@ cr_canseeothergids(struct ucred *u1, struct ucred *u2) if (realgroupmember(u1->cr_rgid, u2)) return (0); - for (int i = 1; i < u1->cr_ngroups; i++) + for (int i = 0; i < u1->cr_ngroups; i++) if (realgroupmember(u1->cr_groups[i], u2)) return (0); @@ -2265,6 +2265,7 @@ cr_xids_subset(struct ucred *active_cred, struct ucred *obj_cred) } } grpsubset = grpsubset && + groupmember(obj_cred->cr_gid, active_cred) && groupmember(obj_cred->cr_rgid, active_cred) && groupmember(obj_cred->cr_svgid, active_cred);