Skip to content

Commit 30d55c8

Browse files
masonclchucklever
authored andcommitted
nfsd: release layout stid on setlease failure
nfs4_alloc_stid() publishes the new stid into cl->cl_stateids via idr_alloc_cyclic() under cl_lock before returning to nfsd4_alloc_layout_stateid(). When nfsd4_layout_setlease() then fails, the error path frees the layout stateid directly with kmem_cache_free() without ever calling idr_remove(), leaving the IDR slot pointing at freed slab memory. Any subsequent IDR walker (states_show, client teardown) dereferences the dangling pointer. The correct teardown for an IDR-published stid is nfs4_put_stid(), which removes the IDR slot under cl_lock, dispatches sc_free (nfsd4_free_layout_stateid) to release ls->ls_file via nfsd4_close_layout(), and drops the nfs4_file reference in its tail. A second issue blocks that switch: nfsd4_free_layout_stateid() unconditionally inspects ls->ls_fence_work via delayed_work_pending() under ls_lock, but INIT_DELAYED_WORK(&ls->ls_fence_work, ...) currently runs only after the setlease call. On the setlease-failure path the destructor would touch an uninitialized delayed_work. nfsd4_alloc_layout_stateid() nfs4_alloc_stid() /* idr_alloc_cyclic under cl_lock */ nfsd4_layout_setlease() /* fails */ nfs4_put_stid() nfsd4_free_layout_stateid() delayed_work_pending(&ls->ls_fence_work) /* needs INIT */ nfsd4_close_layout() /* nfsd_file_put(ls->ls_file) */ put_nfs4_file() Fix by hoisting the ls_fenced / ls_fence_delay / INIT_DELAYED_WORK initialization above the nfsd4_layout_setlease() call, and replace the manual nfsd_file_put + put_nfs4_file + kmem_cache_free cleanup with a single nfs4_put_stid(stp). Fixes: c5c707f ("nfsd: implement pNFS layout recalls") Cc: stable@vger.kernel.org Assisted-by: kres (claude-opus-4-7) Signed-off-by: Chris Mason <clm@meta.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 6e4c62c commit 30d55c8

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

fs/nfsd/nfs4layouts.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,12 @@ nfsd4_alloc_layout_stateid(struct nfsd4_compound_state *cstate,
253253
ls->ls_file = find_any_file(fp);
254254
BUG_ON(!ls->ls_file);
255255

256+
ls->ls_fenced = false;
257+
ls->ls_fence_delay = 0;
258+
INIT_DELAYED_WORK(&ls->ls_fence_work, nfsd4_layout_fence_worker);
259+
256260
if (nfsd4_layout_setlease(ls)) {
257-
nfsd_file_put(ls->ls_file);
258-
put_nfs4_file(fp);
259-
kmem_cache_free(nfs4_layout_stateid_cache, ls);
261+
nfs4_put_stid(stp);
260262
return NULL;
261263
}
262264

@@ -269,10 +271,6 @@ nfsd4_alloc_layout_stateid(struct nfsd4_compound_state *cstate,
269271
list_add(&ls->ls_perfile, &fp->fi_lo_states);
270272
spin_unlock(&fp->fi_lock);
271273

272-
ls->ls_fenced = false;
273-
ls->ls_fence_delay = 0;
274-
INIT_DELAYED_WORK(&ls->ls_fence_work, nfsd4_layout_fence_worker);
275-
276274
trace_nfsd_layoutstate_alloc(&ls->ls_stid.sc_stateid);
277275
return ls;
278276
}

0 commit comments

Comments
 (0)