Commit d0f4a51f authored Jan 28, 2020 by Ben Walker Committed by Tomasz Zawadzki Jan 30, 2020

sock/posix: Block recursive calls to spdk_sock_flush



Don't allow calling spdk_sock_flush while the socket is
closed.

Change-Id: I9020a49ab8906b0f343e3f48f8b96bd38308ab17
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/483148


Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Alexey Marchuk <alexeymar@mellanox.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>

parent 967fa2d7

lib/nvme/nvme_tcp.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,11 @@ nvme_tcp_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_
		struct nvme_tcp_qpair *tqpair = nvme_tcp_qpair(qpair);
		struct nvme_tcp_pdu *pdu;

		if (nvme_qpair_get_state(qpair) == NVME_QPAIR_DISABLED) {
		/* Already disconnecting */
		return;
		}

		nvme_qpair_set_state(qpair, NVME_QPAIR_DISABLED);
		spdk_sock_close(&tqpair->sock);

lib/sock/sock.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -332,6 +332,14 @@ spdk_sock_writev_async(struct spdk_sock sock, struct spdk_sock_request req)
		int
		spdk_sock_flush(struct spdk_sock *sock)
		{
		if (sock == NULL) {
		return -EBADF;
		}

		if (sock->flags.closed) {
		return -EBADF;
		}

		return sock->net_impl->flush(sock);
		}