From nobody Wed Sep 17 12:19:04 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 4cRd9P3Xqgz67HYC; Wed, 17 Sep 2025 12:19:05 +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 4cRd9N6hRvz3VV7; Wed, 17 Sep 2025 12:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111544; 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=4QbtC8363H0wcUtBXMX/X9aoCgTYnMIcfsbPtsP5zRo=; b=S4wODkSRP2j6gcA80Uo7y+dm2VqX0cMDRzVgdtzzZzw4pvISDxl7YojhSPpNjnAVzU7/Tm L4GNIaO4vPu1vwWxSKtTS+B3h636X1FrjvWrs8hYkgWUs07q4NWvY32JeQEjN9OHogG4VN BP16Ln5HjNVdLv0CgmUg8/XBH7eP3uab7yTSyQL7v2uYSadoTM553ULBpnCRA1i/lnWBMb nM65eVsN/P+/lmwraMJ+6JRfe3jVSwoI1scmGF+11nBWUpGA89e6YR5Uz+0u4GES5xx1Kx bG+ZcypP52AUtb+Tj05cKmyTX1jM1JxlvMvzqnZhhHr8LfzFmiSKPCAmElX/xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111544; 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=4QbtC8363H0wcUtBXMX/X9aoCgTYnMIcfsbPtsP5zRo=; b=ebF0czRQEbgWK0t7pLoc5zlAkIwrXXZeKl+vCwANqStDJz5l7hcoRJ3uiQVul7m9Y6NEA2 7BMXSITnwqu0qUrCTLqWwZbc3QXdRO/ERdzxTcVU4TQCFq/V99pRyUqGCS+vXzpKle+IPy m1+dMXebNMiBB9dBASSlQczpBHA2+Wvdz7+87Vk7vAniLXIqyazAs54zZeMdof+nkCZ6gI vEMgDhkvFTtaYXFEVlH5hQzOmnpaD5VDYcp/vCjf17uRfpII69rGSGCHD1v7XhpGlSDGrx rU4LgDRLKQzaVrrMXN5ZSHVespqctN0OPT11ZQDqOoX43NnNdwOhCVP+bhAWQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758111544; a=rsa-sha256; cv=none; b=QRxcrSiHzV4pSM+r3cHCAKWYeYR4F7BlOjSSWpx7B1Mo6hOZNxVSd8DHdmnzT00pwUn1mu e445w6gbn9jzmvFmgEk+R84CgX5024Kjod64/br2/BpLzer7X79eWB2SNKf+Lwi42rgpO4 X4BeSHmtcXL9K1WXP7fZbXaZOfG4mLQtaFOqXvAfdHxEuH7cF+C8YbSx/Ogiq36iOYnybL HXMHHQ89iOAtmhPNbYSnGj0/EokQjO9xAyczy5TWu6DGounsGNZ4h1LkvMBYKG6RsIqXVf V3zGaopXEb/kkvnSRRE5PtdeRrCuE/dMBLX1gEFkosc7cHB3xHpw4NhF0Rplkw== 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 4cRd9N6Drhz8yn; Wed, 17 Sep 2025 12:19:04 +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 58HCJ4ck085754; Wed, 17 Sep 2025 12:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HCJ46s085751; Wed, 17 Sep 2025 12:19:04 GMT (envelope-from git) Date: Wed, 17 Sep 2025 12:19:04 GMT Message-Id: <202509171219.58HCJ46s085751@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: d39756f23fe2 - main - MAC/do: Restore matching the first supplementary group 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: d39756f23fe223d14ff00b1392ba39e94d5eadbc Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d39756f23fe223d14ff00b1392ba39e94d5eadbc commit d39756f23fe223d14ff00b1392ba39e94d5eadbc Author: Olivier Certner AuthorDate: 2025-08-27 15:22:26 +0000 Commit: Olivier Certner CommitDate: 2025-09-17 12:16:03 +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 --- 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)