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 13E2B3DAAB9 for ; Sun, 6 Sep 2026 14:26:51 +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=1788704815; cv=none; b=bwEoYuejFno9I/lcMON1Wew1BO6j+MOEc8YmoXEuM1ToB+EPJiIiIw5gUt0rlDKMKwP258tiwkHpqj3KupvxZMMtCY0TxtO0R5HwGvWZ/DHXAWWmiGvkLgdnrKaeeLbR28O2SF9mvIArr3uy2Q3rjtZii2sHrXfODg0XqSG+0k8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788704815; c=relaxed/simple; bh=ojSPXXm9T+qJwp+GkA+sGPLWZjjm9vUc/OaUM/DLAjM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ejmQBo8LYGol2Hj4AGI2Tqdiy21QbwTG116uk9uFQmzWGtUIK+uJFVsfe9kfDJ7L74gd86LstG9MGwYr4BEVW9zrLmQxGGbhoVgiV7Q7zMEFDBxZztgXF27yNQ9BksBVq3KgCijkU6+f4Yv+vOu1tjunGQnmd/d6jp+CZrpKHyA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cUB41JQo; 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="cUB41JQo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE5A01F00AC4; Sun, 6 Sep 2026 14:26:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788704810; bh=K6+XXaWkDk5LEZhgTnhkC4Kz//41uyZTr3GGn0fQc2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cUB41JQoGLA451lncDA5SJL5cGm/ZnNiaZChT/yG+Rh0L642kqRnTDLZTWOYayC7i 9fx793+8F+WeAnqKk0WkQvcIzJckEXfm0DjalZuEHr/tMPqGFzoqqR0YE+dn94JFbs N4El3qNhQulAvdDtA1a4jS1yf63OdIFT2xK8BS9R38KCpAbTBnywZBd3cC2KDB8sQR YwbW1PIRQsxHTDJQ3gn22Fi0S0QMDTk1fHW1vX2omNXXcSCeiAzsRpRIM8qyDrS1HF DMqqbSH0bVxz4KDJzql7Zc+QG7g2A9fKpCStw6Er88NTYGV+Hc82zDO1fgz3nF0cAl vvcE7A1dI+FiQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Chuck Lever , NeilBrown , Jeff Layton , Sasha Levin Subject: [PATCH 6.6.y 2/2] NFSD: Prevent client use-after-free during delegation revoke Date: Sun, 6 Sep 2026 10:26:47 -0400 Message-ID: <20260906142647.1164860-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260906142647.1164860-1-sashal@kernel.org> References: <2026090335-cramp-chemist-3707@gregkh> <20260906142647.1164860-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever [ Upstream commit 4683ca76b3b7e5808338491c6eb3c20e6b4894d5 ] A delegation stateid holds only a bare pointer to its owning nfs4_client and does not keep it alive. The client survives its stateids only because __destroy_client() drains cl_delegations and cl_revoked before free_client() runs. nfs4_laundromat() breaks that invariant: it unhashes an expired delegation from cl_delegations, drops deleg_lock, then revoke_delegation() relinks it onto cl_revoked under cl_lock. In that window the delegation is on neither list, so client_has_state() can report no remaining state. Every teardown path first requires cl_rpc_users to be zero, but the laundromat holds no such reference. A client whose recalled delegation has just timed out can therefore reach free_client() while revoke_delegation() is still about to dereference cl_lock, a use-after-free. Pin the client with cl_rpc_users across the revoke so teardown blocks until it completes, then reap the delegation from cl_revoked. A client already expiring reaps its own, so skip it and leave the delegation on del_recall_lru. Fixes: 3bd64a5ba171 ("nfsd4: implement SEQ4_STATUS_RECALLABLE_STATE_REVOKED") Cc: stable@vger.kernel.org Reviewed-by: NeilBrown Reviewed-by: Jeff Layton Link: https://patch.msgid.link/20260709-cel-v4-2-1d519d9be0cb@kernel.org Signed-off-by: Chuck Lever Signed-off-by: Sasha Levin --- fs/nfsd/netns.h | 6 ++++-- fs/nfsd/nfs4state.c | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h index 6c01623ee8a3f..7a8f193030406 100644 --- a/fs/nfsd/netns.h +++ b/fs/nfsd/netns.h @@ -100,7 +100,8 @@ struct nfsd_net { struct list_head client_lru; struct list_head close_lru; - /* protects del_recall_lru and delegation hash/unhash */ + /* protects del_recall_lru and delegation hash/unhash; + * nests outside client_lock */ spinlock_t deleg_lock ____cacheline_aligned; struct list_head del_recall_lru; @@ -109,7 +110,8 @@ struct nfsd_net { struct delayed_work laundromat_work; - /* client_lock protects the client lru list and session hash table */ + /* client_lock protects the client lru list and session hash + * table; nests inside deleg_lock */ spinlock_t client_lock; /* protects blocked_locks_lru */ diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index f48597aa3d21d..7452e8b68cc95 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -6235,6 +6235,7 @@ nfs4_laundromat(struct nfsd_net *nn) .new_timeo = nn->nfsd4_lease }; struct nfs4_cpntf_state *cps; + struct nfs4_client *clp; copy_stateid_t *cps_t; int i; @@ -6260,6 +6261,18 @@ nfs4_laundromat(struct nfsd_net *nn) dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru); if (!state_expired(<, dp->dl_time)) break; + clp = dp->dl_stid.sc_client; + spin_lock(&nn->client_lock); + if (is_client_expired(clp)) { + spin_unlock(&nn->client_lock); + continue; + } + /* + * Pin without reviving: get_client_locked() would + * flip a courtesy client back to NFSD4_ACTIVE. + */ + atomic_inc(&clp->cl_rpc_users); + spin_unlock(&nn->client_lock); refcount_inc(&dp->dl_stid.sc_count); unhash_delegation_locked(dp, SC_STATUS_REVOKED); list_add(&dp->dl_recall_lru, &reaplist); @@ -6268,8 +6281,18 @@ nfs4_laundromat(struct nfsd_net *nn) while (!list_empty(&reaplist)) { dp = list_first_entry(&reaplist, struct nfs4_delegation, dl_recall_lru); + clp = dp->dl_stid.sc_client; list_del_init(&dp->dl_recall_lru); revoke_delegation(dp); + /* + * Unpin without renewing: put_client_renew() would + * renew the reaped client's lease. + */ + if (atomic_dec_and_lock(&clp->cl_rpc_users, &nn->client_lock)) { + if (is_client_expired(clp)) + wake_up_all(&expiry_wq); + spin_unlock(&nn->client_lock); + } } spin_lock(&nn->client_lock); -- 2.53.0