From nobody Wed Sep 17 12:19:02 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 4cRd9M11slz67Hkc; Wed, 17 Sep 2025 12:19:03 +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 4cRd9L5Vdjz3Vcb; Wed, 17 Sep 2025 12:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111542; 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=/PyDjLi9ezqN+IE5K322iZOoZI4KFDr8D+XN12gQP0k=; b=SZVIro5WYE806neuSgj2Ex/uij1BkSB0I8w9HffNyD3t5Iur+9C9DnOAeArH+wZgNOWU0v HZ/GkRlsk/bHmnHwSrA9QbYuZgWEBKPdtVMVrI8C6cwzSAheTWvVOb5KTk+Mqe8cS+1uhb gN44lVVLzYYphQjO1RL8d9+g87by0b1Sj0vM4lNqh+Y1XSqeIyjIfJzY9ZuXM3mhFeMAPH iQzpwAgKSDqbx9iEbHcoErYDOKqCLoMlx8LZ/aoapYwn6S71F8Y4MXVViGTD4lG09y7Ypw cErxZ3036FfMolceSaMk6wHdvwED7pEpwPx5OxJYvoMuCexvNt/ljQb05+n+pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111542; 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=/PyDjLi9ezqN+IE5K322iZOoZI4KFDr8D+XN12gQP0k=; b=wF8xxX1XbnDWolTulhe807XRVt5Q2g9b7syXI/rs46OgLx+QIeUun2O6zPqhm0D7KQjLxu A38oGyc8DCopy7kxBmXj6BtUvHoyGpvQyJFBWaFP8D60te+LRGuQRJgpiWNdHL4CZv2feZ v+xGRjw8UGKPNlIqNh3VbYpnyJxv3WD0ur+nSWqtxJv22P/drjo9hGAM+i5RYVFijlVC9D eMTyefUhtPxq2+i92w1rM9skpSw8o0qBVfQXqTYpH0DXX25vTif4NL48QP7kfPXFdA1Rbh bb2j39vUoozrtf9s8uCF5p03yO48eeB0OVbHmC2CErVKg0s423/01XCoLy78Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758111542; a=rsa-sha256; cv=none; b=m25Wwh1vzTj1km82W2nZ3MiAscwiH0foE2Yg6YLPytTso5UMny6XJT05YkHg9YszDayTvQ c76o03hdNd8LDxlGtv3NoZplW/URJV/hu3gbKfiMxVHHgiWt3FR1Yz1I604jQcGb755SjZ XjIZGgwyTl/X63COI83uaKPxgikEiCAB8m9vDSQEJ1b1wZoDz71dDisgxqv/hoRDRZz+2Y 6PcgQtLD5s6+7CFJzTTISUp3rgMD5AKE1bjjs90HchAX1lU7TGa9agL2vRy6x1HTVWS6dk vTyF9ZYA+BPIX8jxs0pNepp6H6WV0JibvzWuJEwwZ7Zq7MfXdXOqhSQNRcfiQA== 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 4cRd9L4hGjz8wS; Wed, 17 Sep 2025 12:19:02 +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 58HCJ2In085673; Wed, 17 Sep 2025 12:19:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HCJ2XU085669; Wed, 17 Sep 2025 12:19:02 GMT (envelope-from git) Date: Wed, 17 Sep 2025 12:19:02 GMT Message-Id: <202509171219.58HCJ2XU085669@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: 0abeb8d8d8df - main - cred: 'struct ucred': Rework comment on 'cr_gid'/cr_groups[] 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: 0abeb8d8d8df1842b0c2d2276c958b0150579a1c Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0abeb8d8d8df1842b0c2d2276c958b0150579a1c commit 0abeb8d8d8df1842b0c2d2276c958b0150579a1c Author: Olivier Certner AuthorDate: 2025-08-27 14:33:24 +0000 Commit: Olivier Certner CommitDate: 2025-09-17 12:16:02 +0000 cred: 'struct ucred': Rework comment on 'cr_gid'/cr_groups[] Make it more straightforward for consumers. Also, recommend using cr_sgroups[] for supplementary groups, as this can generally alleviate index problems and will help us spot and change consumers if/when 'struct ucred' is evolved incompatibly (and cr_sgroups[] suppressed). MFC after: 5 days MFC to: stable/15 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52269 --- sys/sys/ucred.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 9c1d8545af34..254f58841993 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -112,15 +112,21 @@ struct xucred { short cr_ngroups; /* number of groups (incl. cr_gid). */ union { /* - * Special little hack to avoid needing a cr_gid macro, which - * would cause problems if one were to use it with struct ucred - * which also has a cr_groups member. + * The effective GID has been the first element of cr_groups[] + * for historical reasons. It should be accessed using the + * 'cr_gid' identifier. Supplementary groups should be accessed + * using cr_sgroups[]. Note that 'cr_ngroups' currently + * includes the effective GID. + * + * XXXOC: On the next API change (requires versioning), please + * replace this union with a true unaliased field 'cr_gid' and + * make sure that cr_groups[]/'cr_ngroups' only account for + * supplementary groups. */ struct { gid_t cr_gid; /* effective group id */ gid_t cr_sgroups[XU_NGROUPS - 1]; }; - gid_t cr_groups[XU_NGROUPS]; /* groups */ }; union {