Commit 49b33c7f authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Konrad Sztyber
Browse files

lib/nvme_tcp: check destination port before parsing address 



nvme_tcp_parse_addr() uses getaddrinfo() to parse the address.
Depending on the system behavior of this function differs.
On FreeBSD the port is verified not to be exceeding 65535
for IPv4, meanwhile Linux does not check it at this point.

test_nvme_tcp_qpair_connect_sock() UT was attempting to
test the code path that is moved in this patch, but
on FreeBSD was encountering failure during getaddrinfo()
with different error code.

This patch moves the destination port check before
parsing addresses to take the same path regardless of
the system used.

Fixes #2936

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17095

 (master)

(cherry picked from commit f92411c4)
Change-Id: I271e8c32e07a15dcf0e0ee7e90dd174c96b18858
Signed-off-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17519


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarJim Harris <james.r.harris@intel.com>
parent 955755e7

lib/nvme/nvme_tcp.c

+7 −7
Original line number Diff line number Diff line
@@ -1884,6 +1884,13 @@ nvme_tcp_qpair_connect_sock(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpai 


	memset(&dst_addr, 0, sizeof(dst_addr));



	port = spdk_strtol(ctrlr->trid.trsvcid, 10);

	if (port <= 0 || port >= INT_MAX) {

		SPDK_ERRLOG("Invalid port: %s\n", ctrlr->trid.trsvcid);

		rc = -1;

		return rc;

	}



	SPDK_DEBUGLOG(nvme, "trsvcid is %s\n", ctrlr->trid.trsvcid);

	rc = nvme_tcp_parse_addr(&dst_addr, family, ctrlr->trid.traddr, ctrlr->trid.trsvcid);

	if (rc != 0) {
@@ -1900,13 +1907,6 @@ nvme_tcp_qpair_connect_sock(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpai 
		}

	}



	port = spdk_strtol(ctrlr->trid.trsvcid, 10);

	if (port <= 0 || port >= INT_MAX) {

		SPDK_ERRLOG("Invalid port: %s\n", ctrlr->trid.trsvcid);

		rc = -1;

		return rc;

	}



	sock_impl_name = ctrlr->opts.psk[0] ? "ssl" : NULL;

	SPDK_DEBUGLOG(nvme, "sock_impl_name is %s\n", sock_impl_name);