[PATCH v2] nvmet-tcp: check return value of nvmet_tcp_set_queue_sock

[PATCH v2] nvmet-tcp: check return value of nvmet_tcp_set_queue_sock

[Geliang Tang]

From: Geliang Tang <tanggeliang@kylinos.cn>

The return value of nvmet_tcp_set_queue_sock() is currently ignored in
nvmet_tcp_tls_handshake_done(). If it fails (e.g., due to the socket
not being in TCP_ESTABLISHED state), the socket callbacks will not be
properly set, leading to queue and socket leakage.

Fix this by capturing the return value and calling
nvmet_tcp_schedule_release_queue() on failure to ensure proper cleanup.

Fixes: 675b453e0241 ("nvmet-tcp: enable TLS handshake upcall")
Reviewed-by: Hannes Reinecke <hare@kernel.org>
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
v2:
 - add Hannes's reviewed tag.
 - drop patch 2 in v1 as Maurizio suggested.
v1:
 - https://patchwork.kernel.org/project/linux-nvme/cover/cover.1779170418.git.tanggeliang@kylinos.cn/
---
 drivers/nvme/target/tcp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
index 20f150d17a96..88291d45e162 100644
--- a/drivers/nvme/target/tcp.c
+++ b/drivers/nvme/target/tcp.c
@@ -1844,10 +1844,11 @@ static void nvmet_tcp_tls_handshake_done(void *data, int status,
 	if (!status)
 		status = nvmet_tcp_tls_key_lookup(queue, peerid);
 
+	if (!status)
+		status = nvmet_tcp_set_queue_sock(queue);
+
 	if (status)
 		nvmet_tcp_schedule_release_queue(queue);
-	else
-		nvmet_tcp_set_queue_sock(queue);
 	kref_put(&queue->kref, nvmet_tcp_release_queue);
 }
 
-- 
2.53.0

Re: [PATCH v2] nvmet-tcp: check return value of nvmet_tcp_set_queue_sock

[Chaitanya Kulkarni]

On 5/26/26 02:28, Geliang Tang wrote:
> From: Geliang Tang<tanggeliang@kylinos.cn>
>
> The return value of nvmet_tcp_set_queue_sock() is currently ignored in
> nvmet_tcp_tls_handshake_done(). If it fails (e.g., due to the socket
> not being in TCP_ESTABLISHED state), the socket callbacks will not be
> properly set, leading to queue and socket leakage.
>
> Fix this by capturing the return value and calling
> nvmet_tcp_schedule_release_queue() on failure to ensure proper cleanup.
>
> Fixes: 675b453e0241 ("nvmet-tcp: enable TLS handshake upcall")
> Reviewed-by: Hannes Reinecke<hare@kernel.org>
> Signed-off-by: Geliang Tang<tanggeliang@kylinos.cn>

Looks good.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

-ck

Re: [PATCH v2] nvmet-tcp: check return value of nvmet_tcp_set_queue_sock

[Keith Busch]

On Tue, May 26, 2026 at 05:28:05PM +0800, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> The return value of nvmet_tcp_set_queue_sock() is currently ignored in
> nvmet_tcp_tls_handshake_done(). If it fails (e.g., due to the socket
> not being in TCP_ESTABLISHED state), the socket callbacks will not be
> properly set, leading to queue and socket leakage.
> 
> Fix this by capturing the return value and calling
> nvmet_tcp_schedule_release_queue() on failure to ensure proper cleanup.

Thanks, applied to nvme-7.2.