From nobody Wed Sep 17 12:19:03 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 4cRd9N1gD0z67Hk5; Wed, 17 Sep 2025 12:19:04 +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 4cRd9M5pP9z3VTm; Wed, 17 Sep 2025 12:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111543; 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=ZKeppte6CTIakUWG4HFaTCo4vr6N7z6KnARJ3xM+zbw=; b=nYG5eg/T1p/2ZXwg4tHA3c7h6mDxkBQ1tuHphu8KWg7iQPSGbAzxbYECZLWB0uuL7AoDsq c4jmpxNBXzS8h79pGbF+HGpIiEoT2hIUIEl0Dj2cIqf3xI+lH1joYjjLCCUlfbpDJomfmT xtZPHGR7g59OOniwQzHUkbMPeuSY1XXjZhcpAhU1/kQMpbJwCOdliN5kBgIBXLRtiH7AM7 8p2Wu9CxDeCYKa8I6zx1VXxlmfn4UQq4AQJ97EojpnVQ246z9GwnCLXi/d5XcXiagm+Xkq g1AuCWX5Dj0nMQWy/376oSQpEyO+wYWDYRr6fvK8RwxFb8bAGuy95cDGrCEBBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111543; 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=ZKeppte6CTIakUWG4HFaTCo4vr6N7z6KnARJ3xM+zbw=; b=kcw3KUcsWw0yvtXGew0nMNxS68LUAFO2VBto6uMncof479Orn69AEU3FoYLG+Chqhnyuuk aGUCQZhkncSHA1dp1goAKkC/V9cx91r6IeVRS4iSarxNcPlOci4QU3fS8SKTn75ahy/By6 UugQ1CEZ2XHHbCcVNRfrES2sRt4Sq74WgcMHTdFae0f9J8ro8+siAZpKNCfszNi96bv66C hTl3fO+aIn/VO7B0Yh+pWPIehhxtzuI/4OXyTmBl9LmtA7AYQM9vBNVOPmBjwVuDmHszcS ky3OCowidaHBTycbGFH2FJEoqf8WvBb44gIOp0L6q8w9y5sKd5r9bQM2rKKO8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758111543; a=rsa-sha256; cv=none; b=bOqONhBP/yrVz3stMF0gS+O//zhAe77TlvHktfpkcmlmwAAHtoqRfrI1GZEEOA1/BkkWaa wa4FLOWOqI6KKIDSO2c5/pBg4GGxwST4ZjF5QoU0jATZavHrFvmRGalbY4OF++IshYkdln Ijsxrg3ivXbhkFwXHcr0TOyzKQ4YhnRfiGpk4X3AvNmZGSp+oB1huueskviT29SD/foBjH ffcFk7AAfQAnxX6SpPh5ltXlU+sjRuFVtmyDkqDggqmW1Lf8cxjoH5xnchzKRgh/ew+uVG 7A203DES+vwIHW2Fwlrl1skw4w3R+OD6jFB4nqStAEIga6zDYaqpdpVXSt5Tjw== 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 4cRd9M5HHhz8ym; Wed, 17 Sep 2025 12:19:03 +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 58HCJ3ZE085715; Wed, 17 Sep 2025 12:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HCJ3Ki085712; Wed, 17 Sep 2025 12:19:03 GMT (envelope-from git) Date: Wed, 17 Sep 2025 12:19:03 GMT Message-Id: <202509171219.58HCJ3Ki085712@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: ab7186a48634 - main - 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/main X-Git-Reftype: branch X-Git-Commit: ab7186a486347216fde099498471cf847828565c Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ab7186a486347216fde099498471cf847828565c commit ab7186a486347216fde099498471cf847828565c Author: Olivier Certner AuthorDate: 2025-08-27 14:56:21 +0000 Commit: Olivier Certner CommitDate: 2025-09-17 12:16:03 +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 --- 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));