Commit 11b9d0b4 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Keith Busch
Browse files

nvmet-tcp: always initialize tls_handshake_tmo_work 



The TLS handshake timeout work item should always be
initialized to avoid a crash when cancelling the workqueue.

Fixes: 675b453e ("nvmet-tcp: enable TLS handshake upcall")
Suggested-by: default avatarMaurizio Lombardi <mlombard@redhat.com>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Tested-by: default avatarShin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Tested-by: default avatarYi Zhang <yi.zhang@redhat.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 1c22e029

drivers/nvme/target/tcp.c

+3 −1
Original line number Diff line number Diff line
@@ -1854,6 +1854,8 @@ static int nvmet_tcp_tls_handshake(struct nvmet_tcp_queue *queue) 
	}

	return ret;

}

#else

static void nvmet_tcp_tls_handshake_timeout(struct work_struct *w) {}

#endif



static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,
@@ -1911,9 +1913,9 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port, 
	list_add_tail(&queue->queue_list, &nvmet_tcp_queue_list);

	mutex_unlock(&nvmet_tcp_queue_mutex);



#ifdef CONFIG_NVME_TARGET_TCP_TLS

	INIT_DELAYED_WORK(&queue->tls_handshake_tmo_work,

			  nvmet_tcp_tls_handshake_timeout);

#ifdef CONFIG_NVME_TARGET_TCP_TLS

	if (queue->state == NVMET_TCP_Q_TLS_HANDSHAKE) {

		struct sock *sk = queue->sock->sk;