From nobody Mon Sep 21 01:50:17 2026 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 4hp5lf6Mspz6t2jg for ; Mon, 21 Sep 2026 01:50:22 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hp5lf5rz5z3MRB for ; Mon, 21 Sep 2026 01:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789955422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tLIpALIgoSZvT8wsJmrCrpVjZvVstUq+d+eD4yd3wrI=; b=Bl8kcJdDKNOJISOhOdgrRg45Jd0NP+oPPl6RykdEmTlMr/BggaqN9npdynyCRxOzFSk0cM 4HtUt3dY0dEXb3I4BWlBHbaGnsXOCs8fVAC4g5+RgaG9opq8k7nmyZd6GUPnav1R+PyXZi E8XJ+jIqgXkanrYD6yBko9gsQxiEKcGNNSoJycOsnZhcPkpIPKFeIXTECaCHOy0M/wLICy F3P4fgqivqfKOW01/2SBziZM6O4sImXapR/Ppx12BZWUtM3XypZ4Z89Jnsu3qupi4iSZST 09qkd4MrzKhmnS/fCht8Xi59IkJyKO4OvAbgRSLhBlzl/PQOB/4c7OK8U7Eldg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789955422; b=tKX/7j2mEdbhJuXn/QjdJ7w6L979VPUG7qv4hbQjnoJz5TplabeJbPF5Fn//lSHVkRK+f5 2ne+zFe97BKxyJIkYKQ68bjwE7oxWBbmBOGKkeBvUL7eL1urzklo/aqVRrAhDR+62Je3za XY6hnayGZaL5k9fcJxMZHkvDIn9/shIj7vGNwcLTzjnjm3UypFTb28WnRXrtj4TB6B1B1Y EUKpjX2wYHjgfyjkUCpXScDG+ksvWLzAEUfiB6MdDU4RfY9IhzYhh6rxkNC0dISNg3MyDn y0ZkwiEtolvBcfBcs7m37MeyafLe9pi4B63zWwwHpVNGKzniiukXhJVymmTLAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789955422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tLIpALIgoSZvT8wsJmrCrpVjZvVstUq+d+eD4yd3wrI=; b=yRyeQjYHBZMA6ocpk6s7wVGQjLJvJhFtB3QWrqAo4lQHQBpFcNPnl9jhX7a/oprePTedgj IipyX2rQ0R2aUEW1pJUo4qrtK8bO9RMUX6szaNGU7LpaSJOCG4zLVmP7l68kJm+msR/pv6 2Nz5gmI+BlWwQIPAK+O7D6wxOSuyio0nFPadhuOaOtaxZDXCjVjGSQrwvkiojYoe4Ow+g7 cPPTrZDR+/FWGN2dqCvJWkuAgqRRZF2j2v8eTRuEj76qo1R0Hwp3Hl04Nu+4FnWLaVwdV4 DP/cxpeOsk0Q4HH/sx0GcoSdnsQ45loKb0Dvy9UdWcJ+In68pLGRvU0JP4jYRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hp5lf4bv4z10lg for ; Mon, 21 Sep 2026 01:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 197a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 21 Sep 2026 01:50:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Emanuel Helms From: Rick Macklem Subject: git: 2d20de9ffe4d - stable/14 - nfsuserd.c: Fix handling where pw_name/gr_name differ from lookup name 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2d20de9ffe4d59c523592b2558a998043b4b9ccb Auto-Submitted: auto-generated Date: Mon, 21 Sep 2026 01:50:17 +0000 Message-Id: <6ab08d59.197a4.ae973b6@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2d20de9ffe4d59c523592b2558a998043b4b9ccb commit 2d20de9ffe4d59c523592b2558a998043b4b9ccb Author: Emanuel Helms AuthorDate: 2026-09-07 19:50:58 +0000 Commit: Rick Macklem CommitDate: 2026-09-21 01:48:27 +0000 nfsuserd.c: Fix handling where pw_name/gr_name differ from lookup name When an NSS backend returns a canonical pw_name or gr_name that differs from the lookup name supplied by the NFSv4 upcall, nfsuserd stores the successful mapping in the kernel cache under the canonical name instead of the requested name. This causes the retry lookup performed by nfsv4_strtouid() or nfsv4_strtogid() to miss the newly inserted cache entry, resulting in the default UID/GID being returned although the NSS lookup itself succeeded. PR: 296753 (cherry picked from commit 1771ab245c2341033f0cee3bd098c76888cf3515) --- usr.sbin/nfsuserd/nfsuserd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/nfsuserd/nfsuserd.c b/usr.sbin/nfsuserd/nfsuserd.c index e5fd6fb18c81..e4c3480f8e7e 100644 --- a/usr.sbin/nfsuserd/nfsuserd.c +++ b/usr.sbin/nfsuserd/nfsuserd.c @@ -704,7 +704,8 @@ nfsuserdsrv(struct svc_req *rqstp, SVCXPRT *transp) if (pwd != NULL) { nid.nid_usertimeout = defusertimeout; nid.nid_uid = pwd->pw_uid; - nid.nid_name = pwd->pw_name; + /* NSS may canonicalize the name used for the lookup. */ + nid.nid_name = info.name; } else { nid.nid_usertimeout = 5; nid.nid_uid = defaultuid; @@ -737,7 +738,8 @@ nfsuserdsrv(struct svc_req *rqstp, SVCXPRT *transp) if (grp != NULL) { nid.nid_usertimeout = defusertimeout; nid.nid_gid = grp->gr_gid; - nid.nid_name = grp->gr_name; + /* NSS may canonicalize the name used for the lookup. */ + nid.nid_name = info.name; } else { nid.nid_usertimeout = 5; nid.nid_gid = defaultgid;