From nobody Mon Sep 21 01:45:11 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 4hp5dm5V1rz6t2hc for ; Mon, 21 Sep 2026 01:45:16 +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 4hp5dm36yZz3M34 for ; Mon, 21 Sep 2026 01:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789955116; 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=0xBzJIDGJF8YC3ulMN+aS52/gn2NKmSla+eBXn4O1ro=; b=qREr92qS/khh7btKCTE4uupNd60LFTLnlpma/K6s54U8xR7LMCrkVzFJuGOHhrGhBJ7V2D donHv8N7hFRDZjkTNENQnpGEgs19NC7J1j/KHCP8lIWZeS0opKwzGfxnW/cVsSy4FbuShn qGkwik3JXGqyp8C0llaLqih/seWsloJCc6AacMug6YQPs3Bb1BBj+bzir4oY807QdzyKCT 0NxO4hwsRCVvkJPCy8zEinWumqIKKp4c0WBAivzeIl00lSXw54y+6S48eXZYjBYcfi4yyW rLcpABcDFtEvG1imXZ+W5ijRhFURmRdOCAhszYALmclUraheJG8j63jhY1M0jw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789955116; b=k3rEiqlAr3S5akZzzg4tDhio/YPw8jBHjq7hs9KRKMSw4QX7YODji5KQfP+vaINrpL+L2U VtItn8hnPdv/J0c+A+EN97z8OZL0MVsfZXLrsNQXvnSSrXb4gpnrVJpdWUxr/5jWa5dVKe +kg0gsB/R47K0AsRBYqYLce7urUjsGiEju9Hvpzm7rFoI63dnf1QnqlA7ine89B0Jbtms1 kfspM7h6aVf0/dymGH2KbsgoeEMHg+fEkPP0JGnMKmhIK9YdtyuN5cnl5o6jpkGXk/WUUb 9mamRR5B7frsaD0a5kB50ysJ/yLy2e0OtxcWbHF+uGM9m1lARkZmuMz9v3eG9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789955116; 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=0xBzJIDGJF8YC3ulMN+aS52/gn2NKmSla+eBXn4O1ro=; b=MqItPFj/4sIx87aL6vySEkM/Z7q32DI6f6Hy9/W/ruZd6Eou7+k8gLsFJSe8+LWtlx+K8E CDLIpATuGM9IM+EHX5krDPoLoFdyf3q8LISIMuiExbt8P6f3DX35luy2dR334xLYmHmREm +tFS14ZFDOK0/3Bl54Jhb9hb1muro7pixhXg7OFx9D3QNAgUCRofQB4wTSkNVMWu3Jw5kc Yh/uJG0lKp6QhQLYMX27BuoxnCjgCKrHmk3UjkiviWRHcOQ8wPbK87b8OpZsBwWuX2+nEY GbMB391wvHBCFZz3HooC9k2Hm3AA52wfkSJyT0Ev65f88FcR1kRJz87+sH6g6Q== 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 4hp5dm1fF1z10ld for ; Mon, 21 Sep 2026 01:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18fa7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 21 Sep 2026 01:45:11 +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: 45198c6abca7 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 45198c6abca7e61cc690120ab1732481c54cd8eb Auto-Submitted: auto-generated Date: Mon, 21 Sep 2026 01:45:11 +0000 Message-Id: <6ab08c27.18fa7.418f1857@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=45198c6abca7e61cc690120ab1732481c54cd8eb commit 45198c6abca7e61cc690120ab1732481c54cd8eb Author: Emanuel Helms AuthorDate: 2026-09-07 19:50:58 +0000 Commit: Rick Macklem CommitDate: 2026-09-21 01:42:30 +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 9326dd9018e0..e6e215ad2a41 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;