From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4922B35E929; Thu, 2 Jul 2026 20:24:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783023854; cv=none; b=Ayt9dg+TUn0VslHvo2mT7Fu5p1bgYGeK0knyDF4Bd56Kgn/b5RVUi3mar6YrJzf5GwXv7zUh0vdOVYJK+bySC5QX0554Tc/wKvU5oU0271O8JOn663cJTjaDKOBazfdH1QNYbItb1LdFMwhdknWiie1IALGLbZQ38NXT0yONcUY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783023854; c=relaxed/simple; bh=JAmux79vK/x3zIBRw7nbAGO5uthnwlOzMl012oRQgs4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gsBzV/TASgB6pMoqIX4MRJahSUuk98LV1t2tcLWwv6FYEkuhrbcnbLP9wrEZ/d7BwdpplDMEQG2XxVt4+suaDcq+Ix2UrJku67q4BlCpfEXbD5018AWxJKg67F85QAnLw8VVMjem9f5GbYX6ngen0qOylFoimT+RKEGnh203e+w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CLoq75nt; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CLoq75nt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B52571F00A3D; Thu, 2 Jul 2026 20:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783023853; bh=KoXkQDKRgHRYLYlqKF1aOxYpobnYihowBP+MERmUeDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CLoq75ntJIFauox5ln06Sv54to0Uyez0I/yMi15c+mrQgJUXLsbk1Mk51PvsOSLul wCkpEbHXtnG64XuxqmYF67HIkTVKivgVeo7DXuayNXUYgD24t1zaSOKb5urODO3qTt Y28UztrFK73Fg1GzqZOosYirGUDV8YRKzqOO4YTmZ0mKtAjYW9nJpllLb9bHKVWe4T pvSgPwAauWQIyjPwDER15y5uPcmYoO2T9Opya6C60GFhyeoYdfR1Rrxe/8MPUAvbMX VQQ4wZgeiug/2bgd760FAcHhsUkq36W1Fj7OaKxpebXS76KBf7GIzDUKOykWYCcU6n Frw/aph1E68BQ== From: Chuck Lever To: Cc: , Jeff Layton Subject: [PATCH 6.18.y 3/3] nfsd: release layout stid on setlease failure Date: Thu, 2 Jul 2026 16:24:09 -0400 Message-ID: <20260702202409.1583677-3-cel@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260702202409.1583677-1-cel@kernel.org> References: <20260702202409.1583677-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit commit 30d55c8aabb261bc3f427d6b9aae7ef6206063f9 upstream. 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: c5c707f96fc9 ("nfsd: implement pNFS layout recalls") Cc: stable@vger.kernel.org Assisted-by: kres (claude-opus-4-7) Signed-off-by: Chris Mason Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever [ cel: drop fence_work init hoist absent from 6.18.y ] Signed-off-by: Chuck Lever --- fs/nfsd/nfs4layouts.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index 683bd1130afe..62762e43f810 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -256,9 +256,7 @@ nfsd4_alloc_layout_stateid(struct nfsd4_compound_state *cstate, BUG_ON(!ls->ls_file); if (nfsd4_layout_setlease(ls)) { - nfsd_file_put(ls->ls_file); - put_nfs4_file(fp); - kmem_cache_free(nfs4_layout_stateid_cache, ls); + nfs4_put_stid(stp); return NULL; } -- 2.54.0