Commit a8b7b6c3 authored by Andrey Korzinev's avatar Andrey Korzinev Committed by Tomasz Zawadzki
Browse files

nvmf/tcp: extend buffer size for socket address string 



32 bytes is not enough for holding IPv6 address string representation,
which breaks initialization of TCP qpair on server side while accepting
new connection, `inet_ntop()` returns `ENOSPC` in that case and connection
closes abruptly.

Fixes #3590

Change-Id: I8dbe49ce33f3515d732fd5752e30e60f14cde0c4
Signed-off-by: default avatarAndrey Korzinev <ak@nebius.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/25642


Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
parent 94fdb4b6

lib/nvmf/tcp.c

+4 −2
Original line number Diff line number Diff line
@@ -1449,9 +1449,10 @@ nvmf_tcp_qpair_init(struct spdk_nvmf_qpair *qpair) 
static int

nvmf_tcp_qpair_sock_init(struct spdk_nvmf_tcp_qpair *tqpair)

{

	char saddr[32], caddr[32];

	char saddr[SPDK_NVMF_TRADDR_MAX_LEN], caddr[SPDK_NVMF_TRADDR_MAX_LEN];

	uint16_t sport, cport;

	char owner[256];

	/* 1 for colon, up to 5 for port number, 1 for null terminator */

	char owner[sizeof(caddr) + 1 + 5 + 1];

	int rc;



	rc = spdk_sock_getaddr(tqpair->sock, saddr, sizeof(saddr), &sport,
@@ -1460,6 +1461,7 @@ nvmf_tcp_qpair_sock_init(struct spdk_nvmf_tcp_qpair *tqpair) 
		SPDK_ERRLOG("spdk_sock_getaddr() failed\n");

		return rc;

	}

	/* update buffer size for owner when changing format or arguments here */

	snprintf(owner, sizeof(owner), "%s:%d", caddr, cport);

	tqpair->qpair.trace_id = spdk_trace_register_owner(OWNER_TYPE_NVMF_TCP, owner);

	spdk_trace_record(TRACE_TCP_QP_SOCK_INIT, tqpair->qpair.trace_id, 0, 0);