From nobody Tue Sep 23 12:03:33 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 4cWJXj5mQxz68Y70; Tue, 23 Sep 2025 12:03:33 +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 4cWJXj2hFmz3DWl; Tue, 23 Sep 2025 12:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629013; 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=DpWan4OpGGz/VodipW9Vd5ywxBmCkmLDwElUEE+YMM8=; b=LT5J/clBCEchBSKWu2uovzRs5W2pve/RjSMllE1Fgl8trRkkk+wFrMRpz7EMc9y8YICR1s ZbeDcjEXKaZZc8ok5DuRYlKxWuAyypIvd4ueHiZh/Wxh6PyUHgHUZGiyLrpWk/lR8+KbZI ZdZ49ynHuYnEwAxP2VT2Aq4RWOQewT2QO7kVO1Dp6TyUbrQUMilVCpDG02q3+LF6FpoXVl mNSFdm4syVcu/SD1K7WWHCUBOpHnArpYmt8B/7z/xXhrYWDIxSqejKPR57LG2r98vaCARF iUhfmVmnfHqdKh6Mf2rEH0yhad41dLEreVrPdNw7xZz+hrU1/Y/Z16LzIN1zlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629013; 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=DpWan4OpGGz/VodipW9Vd5ywxBmCkmLDwElUEE+YMM8=; b=DxQCJrUKVBYkmvS8X7G3UYVBjAzXu5nENdUmdz2g4VgFMzG1ykDitAOHHLCujFEx24qR5M Lf0dhxQbFjP526+utJOR/wzp8moYNWcF4epyFGTPFv6+9hdbcDN9iWxDBNd9JPdM0nON1l 6QF9l5ygg6qdl7/fPMk6ftonaAYprjKhklFuqzIOxw/LimlnE23rbTdJ63JQKazJXWupI8 LqdFyzh481x51sGRX2LrJyc1DYStgQP74D7mIbtlHtoyzzpOjQrOSmHXBRXJTXRrklhB9d najbjumuRmOleYBVHvxNh3p0aVMPS0ARAWUxiIJqsEL1lwQ07ue9n/faz8ALLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758629013; a=rsa-sha256; cv=none; b=lB5qICZOXCz7EgSnLbWTYAhGHevNjef9GAk+tc/NWuwoI7ZXaBnHQFT80BGxi71Y6Bi+bz TB2oIDh6ru2mCBTOlo+SZDJRCS2HidxTY7w7hT59OztMLj6IrZr5FnnMPzXgw9/ZGOu3pS bEY+k2hgZoJjZ7own8qyYFVCDMsoOuS67uwULfcVO2hwruggn3tK3fDlS+6+YXa0p4KkNV ccM2Wb/e7JAoW+yWAe8Rq7pleAXnYww7gB1p8197b2YHX4MPXZRwm6YHat12Sm9wNoPsYJ o1p+NE4AZUTwLOiyMCgTOz4AXARrnUSWtEWfFwsU2tGEYfw+6P0ne/BVUom6yQ== 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 4cWJXj2HfHzlw5; Tue, 23 Sep 2025 12:03:33 +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 58NC3XT7008436; Tue, 23 Sep 2025 12:03:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NC3XcG008433; Tue, 23 Sep 2025 12:03:33 GMT (envelope-from git) Date: Tue, 23 Sep 2025 12:03:33 GMT Message-Id: <202509231203.58NC3XcG008433@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: 0d836d126129 - stable/15 - cred: Restore proper checking of effective groups in some security policies 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: 0d836d126129dad5c29acf920d5d820520d4476e Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0d836d126129dad5c29acf920d5d820520d4476e commit 0d836d126129dad5c29acf920d5d820520d4476e Author: Olivier Certner AuthorDate: 2025-08-27 14:28:15 +0000 Commit: Olivier Certner CommitDate: 2025-09-23 12:02:42 +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 (cherry picked from commit fa1cbb02d12055db0584882d586658be643f0949) --- 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);