Commit 12d52251 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme: simplify spdk_nvme_transport_id_populate_trstring 



Note that this also works around a false positive in
gcc-11 of type -Wstringop-overread.

Fixes issue #2391.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ib5301b9ef9fa3ead2a1a2318655533a8cfba03fe
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11709


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDong Yi <dongx.yi@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent adde7ea5

lib/nvme/nvme.c

+13 −16
Original line number Diff line number Diff line
@@ -1068,28 +1068,25 @@ spdk_nvme_trid_populate_transport(struct spdk_nvme_transport_id *trid, 
int

spdk_nvme_transport_id_populate_trstring(struct spdk_nvme_transport_id *trid, const char *trstring)

{

	int len, i, rc;

	int i = 0;



	if (trstring == NULL) {

		return -EINVAL;

	}



	len = strnlen(trstring, SPDK_NVMF_TRSTRING_MAX_LEN);

	if (len == SPDK_NVMF_TRSTRING_MAX_LEN) {

		return -EINVAL;

	}



	rc = snprintf(trid->trstring, SPDK_NVMF_TRSTRING_MAX_LEN, "%s", trstring);

	if (rc < 0) {

		return rc;

	}

	/* Note: gcc-11 has some false positive -Wstringop-overread warnings with LTO builds if we

	 * use strnlen here.  So do the trstring copy manually instead.  See GitHub issue #2391.

	 */



	/* cast official trstring to uppercase version of input. */

	for (i = 0; i < len; i++) {

		trid->trstring[i] = toupper(trid->trstring[i]);

	while (i < SPDK_NVMF_TRSTRING_MAX_LEN && trstring[i] != 0) {

		trid->trstring[i] = toupper(trstring[i]);

		i++;

	}



	if (trstring[i] != 0) {

		return -EINVAL;

	} else {

		trid->trstring[i] = 0;

		return 0;

	}

}



int

spdk_nvme_transport_id_parse_trtype(enum spdk_nvme_transport_type *trtype, const char *str)