Commit bea54ef5 authored Mar 24, 2020 by Israel Rukshin Committed by Keith Busch Mar 26, 2020

nvme-tcp: Add warning on state change failure at nvme_tcp_setup_ctrl



The transition to LIVE state should not fail in case of a new controller.
Moving to DELETING state before nvme_tcp_create_ctrl() allocates all the
resources may leads to NULL dereference at teardown flow (e.g., IO tagset,
admin_q, connect_q).

Signed-off-by: Israel Rukshin <israelr@mellanox.com>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>

parent 96135862

drivers/nvme/host/tcp.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -1930,8 +1930,13 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new)
		}

		if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE)) {
		/* state change failure is ok if we're in DELETING state */
		/*
		* state change failure is ok if we're in DELETING state,
		* unless we're during creation of a new controller to
		* avoid races with teardown flow.
		*/
		WARN_ON_ONCE(ctrl->state != NVME_CTRL_DELETING);
		WARN_ON_ONCE(new);
		ret = -EINVAL;
		goto destroy_io;
		}

Admin message