From nobody Thu Sep 18 08:52:00 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 4cS8X14yQyz681ql; Thu, 18 Sep 2025 08:52:01 +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 4cS8X10FtPz3hk4; Thu, 18 Sep 2025 08:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185521; 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=sosBVUzu/+trNvjB/XDwTRjnD/9deaXr/rYk3QEnttk=; b=wrStvp7zFA8Lsj1+AuF42igUd3cUKfAd9M1iernooqGT5iCDtv3SHNcADz6sTg9akK5v+k ZUvcTGBnAaEsd4bFCVyiclsKz5eOwsnkN2BEgNXlnmr0PxNVolGzOPzGnnzstUUH+uvxoM L64DaOx88riF/QFsJFDZMCKLpCvtH1WyxmQHz6QVBcxTdxVCWWOLqKo14IbXLXdtFP78GH akQqHznaWsnTjkeZxqiLD9v/G00zmiljl5PIy+PW30d/PjwRD5mEX08b6lURR2YCfLkQZq uUducgjhb21z1/FRBXMJVzFdroQ/IhNK1rzpjyP+JKcXvVQipYo72DKz9vbOXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185521; 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=sosBVUzu/+trNvjB/XDwTRjnD/9deaXr/rYk3QEnttk=; b=jRBhtn/p5nBcYedDs7sR8ui94cxzcWBwo7OskYTtHN0xqRwb2Zp6eocKqy5eGUKmWj0oCe B0w3EdaIjAJ92Pwxp2kAqeDb6tk6/9PW4CT7LWudG8kcQcCCK31//jlmFFnPirWAF0ZmDT l4vB+2bJV7S3U1ICHCgZWJl8TirqNCwCbTK5lqKdVvkeWO7rOnhbOH52cIOl686Cnjk+B6 ygCIsngZoqBo945vLX6UhhD89NII4k/LUvAgrDvGA5p5BSLKQbG6jQTgDSHhPCeuhnYQmJ HmNkOfcKKDygpCqsLhq9oHJ08YvGtEXVyGg0uOt6YvRn3GAyf7qpHpUb5Vf5og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185521; a=rsa-sha256; cv=none; b=ZGQ9J+lJjgWtw8JQtOn35gdNi2pdCkWZIcECVoTU+rHlxVniGQrWVDHt5nzEM6z9qHjFxQ sr0w8vt1tlyffGjgnmgdeJy8+jWuLRQuDBi1pSmVwqzbEhAxuHztzrbMlOZIr8AKStSWPL iOg+XkfRdJFhnlh0eLoZ0vN8qLeoOLIwQN5RSSBkA3HqMNbeZC2VqhCWAy/IY8wX6aA6W0 hoB2bb5XaoNnpTFR8bMYOM2Xpla/MFSSZ7m6O3vfXMftsn2Jyuck+G0jqjhiWLEorNvlw+ KLA1M1x50Bi7Q+QZhFPRhN/2g4Rpd1DRv6HbRMm9vr3ZiPN1x6ymA2S8xdp4Qw== 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 4cS8X06fk5z145s; Thu, 18 Sep 2025 08:52:00 +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 58I8q0f4017444; Thu, 18 Sep 2025 08:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q08Y017441; Thu, 18 Sep 2025 08:52:00 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:00 GMT Message-Id: <202509180852.58I8q08Y017441@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: 702888ce72ed - stable/15 - nfscl: Restore sending the effective GID to the server 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: 702888ce72edac87bb3299c9df5d573d7e9a1df7 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=702888ce72edac87bb3299c9df5d573d7e9a1df7 commit 702888ce72edac87bb3299c9df5d573d7e9a1df7 Author: Olivier Certner AuthorDate: 2025-08-26 12:55:41 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:29 +0000 nfscl: Restore sending the effective GID to the server Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52256 (cherry picked from commit 71db32347665753a3384e36dcf89c9e3a8af6529) --- sys/fs/nfsclient/nfs_clport.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index e9f1dc23ddbe..77e71d4153c9 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -1098,9 +1098,10 @@ newnfs_copyincred(struct ucred *cr, struct nfscred *nfscr) KASSERT(cr->cr_ngroups >= 0, ("newnfs_copyincred: negative cr_ngroups")); nfscr->nfsc_uid = cr->cr_uid; - nfscr->nfsc_ngroups = MIN(cr->cr_ngroups, NFS_MAXGRPS + 1); - for (i = 0; i < nfscr->nfsc_ngroups; i++) - nfscr->nfsc_groups[i] = cr->cr_groups[i]; + nfscr->nfsc_ngroups = MIN(cr->cr_ngroups + 1, NFS_MAXGRPS + 1); + nfscr->nfsc_groups[0] = cr->cr_gid; + for (i = 1; i < nfscr->nfsc_ngroups; i++) + nfscr->nfsc_groups[i] = cr->cr_groups[i - 1]; } /*