From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 7 Aug 2025 16:12:13 +0000 (+0200)
Subject: smb: client: don't call init_waitqueue_head(&info->conn_wait) twice in _smbd_get_conn... 
X-Git-Tag: v6.16.2~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30237af91d9dbc5cd164a1c65df1401421d6edaf;p=thirdparty%2Fkernel%2Fstable.git

smb: client: don't call init_waitqueue_head(&info->conn_wait) twice in _smbd_get_connection

[ Upstream commit 550a194c5998e4e77affc6235e80d3766dc2d27e ]

It is already called long before we may hit this cleanup code path.

Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c
index cd4c61932cb27..b9bb531717a65 100644
--- a/fs/smb/client/smbdirect.c
+++ b/fs/smb/client/smbdirect.c
@@ -1689,7 +1689,6 @@ negotiation_failed:
 	cancel_delayed_work_sync(&info->idle_timer_work);
 	destroy_caches_and_workqueue(info);
 	sc->status = SMBDIRECT_SOCKET_NEGOTIATE_FAILED;
-	init_waitqueue_head(&info->conn_wait);
 	rdma_disconnect(sc->rdma.cm_id);
 	wait_event(info->conn_wait,
 		sc->status == SMBDIRECT_SOCKET_DISCONNECTED);