[PATCH 06/11] nfsd: pin the client while a GETATTR holds a conflicting delegation

From: Jeff Layton

Date: Fri Nov 20 2026 - 11:41:20 EST


nfsd4_deleg_getattr_conflict() takes a reference on a write delegation
it finds through the inode's lease, sends CB_GETATTR, waits for the
reply, and drops the reference only after that. nfsd4_encode_fattr4()
can also hold the delegation until it has encoded the reply.

A delegation reference doesn't keep its client alive.
__destroy_client() doesn't wait for stateid references, and the final
nfs4_put_stid() uses the client (cl_lock, the stateid idr and
->sc_free). If the client is destroyed while the GETATTR waits,
for example when its lease expires because it doesn't answer the
callback, the GETATTR's put can touch a freed nfs4_client.

Under flc_lock, while the lease is still on the inode, take a client
reference along with the delegation reference. Client teardown removes
the lease before free_client() drops the client's initial reference, so
the client is still live at that point. nfsd4_put_leased_deleg() drops
both references.

Fixes: c5967721e106 ("NFSD: handle GETATTR conflict with write delegation")
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
---
fs/nfsd/nfs4state.c | 41 ++++++++++++++++++++++++++++++++++++++---
fs/nfsd/nfs4xdr.c | 2 +-
fs/nfsd/state.h | 1 +
3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 64bf2e96dc7b..0cd139ee0048 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2912,6 +2912,38 @@ void nfsd4_put_client(struct nfs4_client *clp)
kref_put(&clp->cl_nfsdfs.cl_ref, __free_client);
}

+/*
+ * Reference a delegation found through its lease, for use after flc_lock
+ * is dropped. A delegation reference alone doesn't keep the client:
+ * __destroy_client() doesn't wait for stateid references, yet
+ * nfs4_put_stid() uses the client. So pin the client as well. Caller
+ * holds flc_lock with @dp's lease on the inode. Client teardown removes
+ * the lease before free_client() drops the client's initial reference,
+ * so that reference is still held here.
+ */
+static bool nfsd4_get_leased_deleg(struct nfs4_delegation *dp)
+{
+ if (!refcount_inc_not_zero(&dp->dl_stid.sc_count))
+ return false;
+ nfsd4_get_client(dp->dl_stid.sc_client);
+ return true;
+}
+
+/**
+ * nfsd4_put_leased_deleg - release a delegation found through its lease
+ * @dp: delegation to release
+ *
+ * Drops the delegation and client references that the lease walk took.
+ * May free the client, so the caller must be able to sleep.
+ */
+void nfsd4_put_leased_deleg(struct nfs4_delegation *dp)
+{
+ struct nfs4_client *clp = dp->dl_stid.sc_client;
+
+ nfs4_put_stid(&dp->dl_stid);
+ nfsd4_put_client(clp);
+}
+
static void
free_client(struct nfs4_client *clp)
{
@@ -10854,7 +10886,7 @@ static int cb_getattr_update_times(struct dentry *dentry, struct nfs4_delegation
*
* Returns 0 if there is no conflict; otherwise an nfs_stat
* code is returned. If @pdp is set to a non-NULL value, then the
- * caller must put the reference.
+ * caller must release it with nfsd4_put_leased_deleg().
*/
__be32
nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct dentry *dentry,
@@ -10899,7 +10931,10 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct dentry *dentry,
return 0;
}

- refcount_inc(&dp->dl_stid.sc_count);
+ if (!nfsd4_get_leased_deleg(dp)) {
+ spin_unlock(&ctx->flc_lock);
+ return nfserr_jukebox;
+ }
ncf = &dp->dl_cb_fattr;
nfs4_cb_getattr(&dp->dl_cb_fattr);
spin_unlock(&ctx->flc_lock);
@@ -10940,7 +10975,7 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct dentry *dentry,
}
status = nfs_ok;
out_status:
- nfs4_put_stid(&dp->dl_stid);
+ nfsd4_put_leased_deleg(dp);
return status;
}

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 950c67362566..e6131095024f 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -4106,7 +4106,7 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,
if (!timespec64_is_epoch(&ncf->ncf_cb_atime))
args.stat.atime = ncf->ncf_cb_atime;

- nfs4_put_stid(&dp->dl_stid);
+ nfsd4_put_leased_deleg(dp);
} else {
args.change_attr = nfsd4_change_attribute(&args.stat);
}
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index e9816000c943..f80abcc278f6 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -977,6 +977,7 @@ extern void nfsd4_shutdown_callback(struct nfs4_client *);
extern void nfsd4_shutdown_copy(struct nfs4_client *clp);
void nfsd4_get_client(struct nfs4_client *clp);
void nfsd4_put_client(struct nfs4_client *clp);
+void nfsd4_put_leased_deleg(struct nfs4_delegation *dp);
void nfsd4_async_copy_reaper(struct nfsd_net *nn);
bool nfsd4_has_active_async_copies(struct nfs4_client *clp);
void nfsd_update_cmtime_attr(struct file *f, unsigned int flags);

--
2.56.1