From nobody Thu Aug 6 19:53:49 2026 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 4hGHz65xcrz6n71B for ; Thu, 06 Aug 2026 19:53:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGHz62yj9z44d5 for ; Thu, 06 Aug 2026 19:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786046034; 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=Iy8HRq0/qEX4dNlEFmjfn9iKEEBN+Jj31TUHl3hGppA=; b=AnQZTo1ySCOMXrIgH02dZq4UEGs0xEhIHwI5OM89rq+jTMCCQuJhjAZnhtWI4EZZdvEy5d FloCPkURDbK8S/qPFt8KQIQZ0BmKpM7C21FR6gtaTjjDAzFwvryOQ4YECZvdzxDcN3wbuw HjW1oIlCQV1Rl5hW5wnoNTbxrPdICUDJDV8RVYt2ydU5AJUhwp5x5j41JVQgcfC9SI5Lrg 4NdKUf/aTJx+shE67EgobVvx9jIuToBhUir9IBkW12DZyH+41QlfE+ezkhafLDwfRYw7vC Upf8L4wFMx1CxOyyTifeV9SVtwKlR3htsJrT/VFlfmqCt55sGIpHn/plG+AyFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786046034; a=rsa-sha256; cv=none; b=Y/tpdb3zGg5SI80KTVYCjM1t7I/FNb3/NUiyn0dV06JyGTYWqUsij+1gyuA4XJNvvZvCxE MLIZ/OssyTUw61iBm7jdM0e6h92qB9GSE8aDK703HgXeKg7w+NeRDGZIVLek+xWnduvg7j eoDpbU2gk0tm3gEEBqjIZ3NhFGjWaS/FxNtWq3jppcuU6RCBOPbDqbEhul1gOLlcuRiRbK G0bma4Yz11/02UlVgQDOqT1mvrz7z1jbtb5E9Rq97HkBxzEabtx52fwdquskvqry4iXI7a XipoOR8av7nONF5eSuOro/YckhIOcCxtfW+t+g+e83DZ5I2s/Z0/Xh9BXjUhRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786046034; 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=Iy8HRq0/qEX4dNlEFmjfn9iKEEBN+Jj31TUHl3hGppA=; b=YJhIHgYHEOiOW+sr/PrTBIucch9MGwMr0mndYUGVIXev4As2IEzVUe9Nro4VHVoKChv3jW Qodpv/S2r9vg64Ur6ivry16pJgn0WWhxZD4s6exdLjiEZqO7rTyNobtisCxGIjripMiWjN aZNETtvDxFDJ0K0/4smSJ9Y8zgMO3vQs9ZF9/k23DPtmK3YmfRCQYe7ZopOP07T3xmpjE6 +rNUqZMq1Nvaxs3PO4QGGLaH/UxLtIZ/0k3ZXtRDa4gZFEv6zXrxB3W/IQRxTMqhQMVPQP Rz6bgWRVkLY81sOv5VncyaEtUFWN8ZM+diJJfQqdTcayOEgFa8dytNR/GycVxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGHz61PjLzc0f for ; Thu, 06 Aug 2026 19:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3da46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 19:53:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: bdea6e971844 - stable/14 - nfs_commonkrpc.c: Get rid of NFSv4.0 delegation cruft 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 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: bdea6e971844ac2e0a3dfab47fc6e678a11e5d19 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 19:53:49 +0000 Message-Id: <6a74e64d.3da46.e2770c3@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=bdea6e971844ac2e0a3dfab47fc6e678a11e5d19 commit bdea6e971844ac2e0a3dfab47fc6e678a11e5d19 Author: Rick Macklem AuthorDate: 2026-08-04 15:55:24 +0000 Commit: Rick Macklem CommitDate: 2026-08-06 19:52:36 +0000 nfs_commonkrpc.c: Get rid of NFSv4.0 delegation cruft Delegations in NFSv4.0 never worked well and, since the NFSv4.0 protocol is now deprecated, use of delegations for NFSv4.0 is disabled as far as the client can do so. It turns out that some Illumos NFSv4.0 server issues delegations anyhow (even when the callback path is specified as 0.0.0.0) and this can cause use after free problems. This patch deleted some cruft that did an nfsrpc_openrpc() call recursively when an NFSv4.0 server failed to issue a delegation when it had previously done so. This code was only meant to be an optimization and would have been rarely exercised. Since this recursive call of nfsrpc_openrpc() is in some of the backtraces in the bugzilla PR, getting rid of the cruft makes sense. It is not known if this helps w.r.t. the use after free problems at this time. PR: 297233 (cherry picked from commit 8f20299b473af6132e0f146d7f634640993aeb81) --- sys/fs/nfsclient/nfs_clrpcops.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 755372d51a68..b704169dbaab 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -727,33 +727,6 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, else op->nfso_posixlock = 0; - /* - * If the server is handing out delegations, but we didn't - * get one because an OpenConfirm was required, try the - * Open again, to get a delegation. This is a harmless no-op, - * from a server's point of view. - */ - if (!reclaim && (rflags & NFSV4OPEN_RESULTCONFIRM) && - (op->nfso_own->nfsow_clp->nfsc_flags & NFSCLFLAGS_GOTDELEG) - && !error && dp == NULL && ndp == NULL && !recursed) { - do { - ret = nfsrpc_openrpc(nmp, vp, nfhp, fhlen, newfhp, - newfhlen, mode, op, name, namelen, &ndp, 0, 0x0, - cred, p, syscred, 1); - if (ret == NFSERR_DELAY) - (void) nfs_catnap(PZERO, ret, "nfs_open2"); - } while (ret == NFSERR_DELAY); - if (ret) { - if (ndp != NULL) { - free(ndp, M_NFSCLDELEG); - ndp = NULL; - } - if (ret == NFSERR_STALECLIENTID || - ret == NFSERR_STALEDONTRECOVER || - ret == NFSERR_BADSESSION) - error = ret; - } - } } if (nd->nd_repstat != 0 && error == 0) error = nd->nd_repstat;