From nobody Tue Sep 23 12:03:36 2025 X-Original-To: dev-commits-src-branches@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 4cWJXn3Zk1z68Y9V; Tue, 23 Sep 2025 12:03:37 +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 4cWJXm5z74z3Dqf; Tue, 23 Sep 2025 12:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629016; 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=4sn2c0dcKHNL/S+plvcX+ux7XXQF6tjGpQJJAXIaUtA=; b=JTu7KNGLPJPS2OsDiQZ2HKjkTcUAfNGGSdswYKiuMUy47NXruHFn8eFh4Up/wapzhhibdH TrpAzqz9kaX4nxOxcPl1CEdy7EHvAgbRtxoLj0+e8PsRTFk7/L5I/qO+H2uH70YGANB/Tl 8HzxFSptpULZgpwI5ZgLssF45JJQ7NdnsnfFIbRNm4TrXHd3OH1THjcyPGwfxDfemGFT+X TUgZIUdyA1Xzfmnl5mA42yTcZcnEnZp3sNDxJ3jTet9ZuSbTV1ZWo6aiBGGt2F0Q3fer5n 4+kBFb1hZPhQ0hpz5+LWb9Crgsy6s2LCaK8HQFYFWzBtiV+vzJY0UlndHirV0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629016; 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=4sn2c0dcKHNL/S+plvcX+ux7XXQF6tjGpQJJAXIaUtA=; b=NTlkoMNlVRRxCDIPhLxBt8hZLpGKZioSrCyQoP8YOOeuNVe8Pt3NBYcZMsdGW9JrTd7XKN F30gY2ypsD+Rb0lmednHniRt/juCcVqCwfdhamBef/6j9A5strXzMTJgWvf7bRF7NjrCLh eQUdp2JpaJ9gO/yxq6qbPFq7B1Iw1HwxHtjYfooeph8zzVhWunAcCbPMq5gSq8yPa4OWpG nsfuqTq8VNxgzMAT5WWvQdAKwYWa8DDF6c4U55AT6e7tCIuX9Dm09KenuiXFl/HRCjMmxo nLcJFHtC2CIXSG/YAW9iNP6i+t79IDmxoOPAtaDbtWofZOCOQPHZw99yJKXCBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758629016; a=rsa-sha256; cv=none; b=bIKTeGNXSawN9Rq3FhUhIc57IAB991EzIFDz6MWvbmXt3g9rb0x5mv7Zs3vH3SFDdi7x1F 08zwuWcjYEKR0S7Tm9/wkHd7ZVh1ukjpZ1G6JSnMj0Qq6JS70vFTm9xwd2qTc+VIh9/0sc euH5ZtTOafpHlRzKPm3e7MFkrYg41WH7O87P0S3PBZNB+IztkJ2OMekrEl9zMFYtq9OGBG 8WJznBt/MGcoXSOqNVleVthYVCVG2i93v9fPtCI6kXT/H04nVPBzluCyyzwFMfwBt8xYar RUC3qWjBHN3COyX0bPtfwEuvPcOhwkS+HEqMqQCJ/iISk1TmJ6WQwVCunkmdPg== 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 4cWJXm5L4gzlw6; Tue, 23 Sep 2025 12:03:36 +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 58NC3aMj008545; Tue, 23 Sep 2025 12:03:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NC3aX7008542; Tue, 23 Sep 2025 12:03:36 GMT (envelope-from git) Date: Tue, 23 Sep 2025 12:03:36 GMT Message-Id: <202509231203.58NC3aX7008542@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: dd5c76309ad9 - stable/15 - MAC/do: Restore matching the first supplementary group List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: dd5c76309ad98c9b058a79f6b674c5dfc44631c1 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=dd5c76309ad98c9b058a79f6b674c5dfc44631c1 commit dd5c76309ad98c9b058a79f6b674c5dfc44631c1 Author: Olivier Certner AuthorDate: 2025-08-27 15:22:26 +0000 Commit: Olivier Certner CommitDate: 2025-09-23 12:02:43 +0000 MAC/do: Restore matching the first supplementary group As 'cr_gid' was in fact stored in cr_groups[0], rule_grant_supplementary_groups() would loop only on further elements of cr_groups[]. Now that cr_groups[0] is not 'cr_gid' anymore, but some supplementary group, take it into account. 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/D52271 (cherry picked from commit d39756f23fe223d14ff00b1392ba39e94d5eadbc) --- sys/security/mac_do/mac_do.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 7a5ac2e01f75..6f3e63d06198 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -1650,7 +1650,7 @@ rule_grant_supplementary_groups(const struct rule *const rule, const bool current_has_supp = (gid_flags & MDF_CURRENT) != 0 && (gid_flags & MDF_SUPP_MASK) != 0; id_nb_t rule_idx = 0; - int old_idx = 1, new_idx = 1; + int old_idx = 0, new_idx = 0; if ((gid_flags & MDF_ANY_SUPP) != 0 && (gid_flags & MDF_MAY_REJ_SUPP) == 0)