[PATCH 1/2] nvmet-tcp: check return value of nvmet_tcp_set_queue_sock

[Hannes Reinecke]

On 5/19/26 08:10, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang at 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")
> Signed-off-by: Geliang Tang <tanggeliang at 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 164a564ba3b4..8a243d22a511 100644
> --- a/drivers/nvme/target/tcp.c
> +++ b/drivers/nvme/target/tcp.c
> @@ -1842,10 +1842,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);
>   }
>   

Reviewed-by: Hannes Reinecke <hare at kernel.org>

Cheers,

Hannes
-- 
Dr. Hannes Reinecke                  Kernel Storage Architect
hare at suse.de                                +49 911 74053 688
SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg
HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich