From nobody Mon May 25 04:34:01 2026 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) (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 D669E359A68; Mon, 18 May 2026 20:17:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.145.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779135424; cv=none; b=RjSj/Ms6+pexqZ85coi8Qlc04epNSb22nn62ubCzh1b29rQ3k20dI5R2SdMENt9MmCwuCG22djoL1rl2Ax1C7TUX5bUu0BXf/sj2R/40qoVI/bFjgaa7nXZUMfetn6auIIQzSZk3eH6oloBMMs4zPggRelEK0tMzF1LJCGJ5EHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779135424; c=relaxed/simple; bh=Z+IHZUanG1ywyo8cBNQtrPh3XO++jDPkltGzdSZwLIw=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=ivoZPwnE29wOngC10ia5toMbtPwUDlhtcVh+Tor4go5KLLcw1oURMqPkI5xFnazB4uR/I4xkJsXRCbcA66UvsDkgt3u82aVi4Wdv5GrjNV6+zq8BQO6qurhr1wK3DykvHa9m1NNYus8ZpyFmA7ydaXiZ46xm1PFHSj7jWspHG9E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meta.com; spf=pass smtp.mailfrom=meta.com; dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com header.b=OqWjtnrI; arc=none smtp.client-ip=67.231.145.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meta.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meta.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com header.b="OqWjtnrI" Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64IKBA3x976334; Mon, 18 May 2026 13:16:59 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h= content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=s2048-2025-q2; bh=HClNkfLVOqMZ4nzMRJ 4OIKNgF9Ij9i1NyKvveVue/ew=; b=OqWjtnrImXTg3tmplIQUW7dqE/4pMUV6Za 68W1Dkkscn4qtNIRK2pfZ/PsYmbXvYqyEfg1NmGBaAouE3PAlKInf0HQ4Qt7ASqA 6nmD6CMsCvjZAEiuNCfUxx0iNqjsKZuK8sztkAHXleIKWOptUtRFiJ07cfmbYe5+ T4m1klXexVaxO5+RGBO7ZSDP7/L3+gVEo6ND3Vg7UvGZ7/B3XcaNiJWdt36vt2Fw PNGmmxN0N2JT6c0Ag09yIeL0qI8CGhLX22QF3n+mDW6N1wykH0n23Af0FRlstapI hac6JeWcavxSMJl97LCQ4tDkLmaCKgTr/2aBfmY1hTR2Sw7GAu3A== Received: from maileast.thefacebook.com ([163.114.135.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4e6qvgb4ev-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 18 May 2026 13:16:59 -0700 (PDT) Received: from devbig003.atn7.facebook.com (2620:10d:c0a8:1b::2d) by mail.thefacebook.com (2620:10d:c0a9:6f::237c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.37; Mon, 18 May 2026 20:16:58 +0000 From: Chris Mason To: Chuck Lever , Jeff Layton , , Subject: [PATCH] nfsd: release layout stid on setlease failure Date: Mon, 18 May 2026 13:16:36 -0700 Message-ID: <20260518201647.3383242-1-clm@meta.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTE4MDIwMSBTYWx0ZWRfXybF/Gy2z3TMP tQAvejYKblboWAdyRBPyRwsSpRsArTw+QSQau2OKCfJ9byM2JfKN4Fa+WWil3GTMlvHu2z6Cu0T ub3bkXBadt2XjYl4fJ3eoQO6z873wW7eVJU7dMEGGZKenL8zxnoJbqdYZPvMY7LZvBFeazakCn7 QClRp5LvSH6i/eo0cLBdrVopL84/mn41VPsJURAt20+5tk2Kj0nwRNXF9zG0Es4+eB2QlPwmE4O r3S/hjW9+ZR6Fa7uBiixrMDFA71y7rhnruRQirhXSdIQOayryYj2Wv7iVPNt27a69O7rllwIF4U YS4JDmtanYzzo2MMbcPMD2vgESXVPkxIDPCt8Zp9Mo2We5Kic2PKcmku50Vn4vPhLFm4ZT+lmSK MF3YCYj4wL98dj+qAr/rrIgQ10D1HNNWKzBqfyQuL7yaevNJvhgrhl1pwJR7nVQnqHQ4eeUF3Mv 7UONmBnHRzl4flU9TyQ== X-Authority-Analysis: v=2.4 cv=LpqiDHdc c=1 sm=1 tr=0 ts=6a0b73bb cx=c_pps a=MfjaFnPeirRr97d5FC5oHw==:117 a=MfjaFnPeirRr97d5FC5oHw==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=7x6HtfJdh03M6CCDgxCd:22 a=crHB47gyY4rKiduisYu9:22 a=VabnemYjAAAA:8 a=k2GFplJh7JMNf-uIoQwA:9 a=gKebqoRLp9LExxC7YDUY:22 X-Proofpoint-ORIG-GUID: lGCIChPGuo5xxgNU_HTGsxS9SledNsRy X-Proofpoint-GUID: lGCIChPGuo5xxgNU_HTGsxS9SledNsRy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-18_03,2026-05-18_01,2025-10-01_01 Content-Type: text/plain; charset="utf-8" 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") Assisted-by: kres (claude-opus-4-7) Signed-off-by: Chris Mason Reviewed-by: Jeff Layton --- fs/nfsd/nfs4layouts.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index 69e41105efdd..8e2929cffa7c 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -264,10 +264,12 @@ nfsd4_alloc_layout_stateid(struct nfsd4_compound_stat= e *cstate, ls->ls_file =3D find_any_file(fp); BUG_ON(!ls->ls_file); =20 + ls->ls_fenced =3D false; + ls->ls_fence_delay =3D 0; + INIT_DELAYED_WORK(&ls->ls_fence_work, nfsd4_layout_fence_worker); + 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; } =20 @@ -280,10 +282,6 @@ nfsd4_alloc_layout_stateid(struct nfsd4_compound_state= *cstate, list_add(&ls->ls_perfile, &fp->fi_lo_states); spin_unlock(&fp->fi_lock); =20 - ls->ls_fenced =3D false; - ls->ls_fence_delay =3D 0; - INIT_DELAYED_WORK(&ls->ls_fence_work, nfsd4_layout_fence_worker); - trace_nfsd_layoutstate_alloc(&ls->ls_stid.sc_stateid); return ls; } --=20 2.52.0