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 350E339CCF8; Sat, 12 Sep 2026 20:02:31 +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=1789243353; cv=none; b=qMGM1+JZnRzqEV5i3AlZctnp35MUDNQZZ9N/IR1iihdUuTwu+WKbtqC/2mPgC6EMECiuFyF2BjdJy8Lv5Mv1111JRV8hOwJq9H8InBjTarzRYKDbofAy1Dc++Keba1EzTCMJ0W8+wjL9VXDse/nkGEViOgIgbFNVkRGDixcXXxE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789243353; c=relaxed/simple; bh=h4ZsBWyR7mv1ELD32OdrntPCnNgCNL3tzBzJ229yhRs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rZvvINcY1/T3kIw7ITMRbLQKoUQrrJRSvUxxpYukDhC4BvQ6gEp5XOQQc5PW9NRJ5wczLBi9/12NMeZr4KS8n5Ar1RexFZ14+1leX0AA8RPCMxBgZdkiK3vfLG8WoEGCJdQEHDygx2FDBCi0UqV3/VSD3fYwePYFaO3wBBh75oc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AIBGDBUa; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="AIBGDBUa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 176411F000FF; Sat, 12 Sep 2026 20:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789243350; bh=JtQ57y0DHM6BxOiR6eThRqTP0qp7toDNORWqFsrOApY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AIBGDBUaJA6+B0sFVEj9YI79SCiRQgpP+464ane+lNtX8r4aaCaWh/6oxb1SIXndh EElA1kS+SU1cfNzIcVIiC2GNTSIfKoIvS6D3FGChczsxacE1vJRnJZIaphdV5CgoRK yVC8ZfWyCCYsfL8mck5oZdtbU1Bd0fLFHj/tT9WE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ruoyu Wang , Trond Myklebust , Sasha Levin Subject: [PATCH 5.10 724/798] NFSv4: remove callback IDR entry on client allocation failure Date: Sat, 12 Sep 2026 09:05:52 +0200 Message-ID: <20260912065533.675676987@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065516.948645775@linuxfoundation.org> References: <20260912065516.948645775@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ruoyu Wang [ Upstream commit d05c2007b3d84ccba11dc6e9cb3202768cc72f14 ] nfs4_alloc_client() allocates an NFSv4.0 callback identifier before it finishes setting up the client. If any later initialization step fails, the error path frees the nfs_client directly with nfs_free_client(). That bypasses nfs_put_client(), which is where the callback IDR entry is removed during normal teardown. A failed allocation can therefore leave cb_ident_idr pointing at a freed nfs_client. A later NFSv4.0 callback lookup by cb_ident would find the stale pointer and take a reference to it. Make the callback IDR removal helper callable by the allocation failure path, and remove the callback identifier before freeing the client. This was found by a local static-analysis checker for publish-before-free lifetime bugs and confirmed by manual inspection. Fixes: f4eecd5da342 ("NFS implement v4.0 callback_ident") Signed-off-by: Ruoyu Wang Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/client.c | 14 +++++++++++++- fs/nfs/internal.h | 1 + fs/nfs/nfs4client.c | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 6134101184fae..43393dddbfbe2 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -208,9 +208,21 @@ static void nfs_cb_idr_remove_locked(struct nfs_client *clp) { struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id); - if (clp->cl_cb_ident) + if (clp->cl_cb_ident) { idr_remove(&nn->cb_ident_idr, clp->cl_cb_ident); + clp->cl_cb_ident = 0; + } +} + +void nfs_cb_idr_remove(struct nfs_client *clp) +{ + struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id); + + spin_lock(&nn->nfs_client_lock); + nfs_cb_idr_remove_locked(clp); + spin_unlock(&nn->nfs_client_lock); } +EXPORT_SYMBOL_GPL(nfs_cb_idr_remove); static void pnfs_init_server(struct nfs_server *server) { diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index fd15280e827a0..abd0ba394e42f 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -217,6 +217,7 @@ void nfs_server_copy_userdata(struct nfs_server *, struct nfs_server *); extern void nfs_put_client(struct nfs_client *); extern void nfs_free_client(struct nfs_client *); +void nfs_cb_idr_remove(struct nfs_client *clp); extern struct nfs_client *nfs4_find_client_ident(struct net *, int); extern struct nfs_client * nfs4_find_client_sessionid(struct net *, const struct sockaddr *, diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 5fd63df2db8b1..51a1eb407c393 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -267,6 +267,7 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init) return clp; error: + nfs_cb_idr_remove(clp); nfs_free_client(clp); return ERR_PTR(err); } -- 2.53.0