From nobody Tue Sep 23 12:03:35 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 4cWJXm00BFz68YRd; Tue, 23 Sep 2025 12:03:35 +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 4cWJXl4smZz3DcM; Tue, 23 Sep 2025 12:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629015; 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=FunnI5c/70deib9K1jRO98qE/2+nGXzMvQp9LmtJGoo=; b=jDElbGZzFxQfBE03gRUj1lp+0WifT8ZjYhDmmyG8WhpT4zpOyKmyD/ijp8t7GPAQkXJZRW hyliChHWSgcJ4HpMZu+un+ug6PAyKV9nFHMZkUmBi3bV5S2KNk550Wmbtu33+QYr1T9gj2 L/qgK+Br7VVhk410PCWid+r/j76zSEfpVwBjZ37eDuHwM83/EuQTku2LGsMtxZae7U6X6X xAAXKAwpa51VsdCegyNSO1dh8SEvj7Bhv1K977pmNrXbqUpAxdZ4tW6KXQaVsbUqmH1kKS ZTyrrRGiDJ2FLBI6EwBzAXhKOugZsU34FEoe8mFpFmxB6trd2upx0pdOZCMaAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629015; 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=FunnI5c/70deib9K1jRO98qE/2+nGXzMvQp9LmtJGoo=; b=pcZj3b23yHNjy0gn9tc3P9DGeEURy7DvNPThjekVCZnSYZbnCgwhC3W/6XpQwgCX16Vf8v BMaSAuIn/OMRMDOz5umdMoQDicUGhA8VCqJKfA9dj+7MnUmGQ+9iDEqotz8Y9DDJuvULPG etkbIgMLx552P7ewZWRgOjEnw7D7UbLZqo2x8q7y+NzA+mPuy5zVTu+aad0dprbQXdZcRW 05aRoRwW2bbCWCE41+837fTxA6qM1oB4Y33s5gvhYgLbnsQPocsBMr0kN1frv9qvYdnCzq yVg0//bteVomyXKWdRWeltKJ6LYFqdTTlPilRlpaed2feDpk1FONOJxro/48HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758629015; a=rsa-sha256; cv=none; b=r11C3iXkmX80+NLAJUG+9vSF7rhYhigCluF/zgIjKtbjd3bL8XWbHvMUmhkH5oq2qANPTB rfW2RY6M3zMXcmhF9u2kOngZbh8GQBE8Y2AYXty0SVMgZUO4Ly92PmdCjVHwMN0d4ptgtQ 2/RmlqlaDK4dWHXw3dntRHD1fxfkgORbjTBhLXPKXvPFzydg7CvY6wz6SJoogkEW4C8bZ9 GAN9VvANumy34vD816tNo9nl3NHqVaqO/K7ftdIPz75U5tCKzK/GA0bhmpRypeHnlfg4sa fdI6JDybNf9KUOQ/ku4JllMmvRCcT9RdohAtMr6nNEVUXh9437QkbTBKZe6ZNA== 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 4cWJXl4NNczlRb; Tue, 23 Sep 2025 12:03:35 +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 58NC3ZnS008508; Tue, 23 Sep 2025 12:03:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NC3ZAm008505; Tue, 23 Sep 2025 12:03:35 GMT (envelope-from git) Date: Tue, 23 Sep 2025 12:03:35 GMT Message-Id: <202509231203.58NC3ZAm008505@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: a482c6975867 - stable/15 - MAC/bsdextended: Restore matching subjects' effective GID 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: a482c69758671233b5a18d85d3f816face6f8868 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a482c69758671233b5a18d85d3f816face6f8868 commit a482c69758671233b5a18d85d3f816face6f8868 Author: Olivier Certner AuthorDate: 2025-08-27 14:56:21 +0000 Commit: Olivier Certner CommitDate: 2025-09-23 12:02:43 +0000 MAC/bsdextended: Restore matching subjects' effective GID 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/D52270 (cherry picked from commit ab7186a486347216fde099498471cf847828565c) --- sys/security/mac_bsdextended/mac_bsdextended.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/security/mac_bsdextended/mac_bsdextended.c b/sys/security/mac_bsdextended/mac_bsdextended.c index 8a6549214380..bf95c008e2f2 100644 --- a/sys/security/mac_bsdextended/mac_bsdextended.c +++ b/sys/security/mac_bsdextended/mac_bsdextended.c @@ -246,7 +246,9 @@ ugidfw_rulecheck(struct mac_bsdextended_rule *rule, } if (rule->mbr_subject.mbs_flags & MBS_GID_DEFINED) { - match = ((cred->cr_rgid <= rule->mbr_subject.mbs_gid_max && + match = ((cred->cr_gid <= rule->mbr_subject.mbs_gid_max && + cred->cr_gid >= rule->mbr_subject.mbs_gid_min) || + (cred->cr_rgid <= rule->mbr_subject.mbs_gid_max && cred->cr_rgid >= rule->mbr_subject.mbs_gid_min) || (cred->cr_svgid <= rule->mbr_subject.mbs_gid_max && cred->cr_svgid >= rule->mbr_subject.mbs_gid_min));