Commit 8bab99fb authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Jim Harris
Browse files

nvme_manage: assert ns not being NULL when displaying namespaces 



Assert that spdk_nvme_ctrlr_get_ns() does not return NULL.
If display_namespace() would proceed with ns == NULL,
functions below will segfault since the input is not verified there.

Change-Id: I12c4b617aca703f07275fbc6ab593b42c25e2ccd
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/451830


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 5a484d4a

examples/nvme/nvme_manage/nvme_manage.c

+4 −1
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ display_namespace(struct spdk_nvme_ns *ns) 
static void

display_controller(struct dev *dev, int model)

{

	struct spdk_nvme_ns			*ns;

	const struct spdk_nvme_ctrlr_data	*cdata;

	uint8_t					str[128];

	uint32_t				nsid;
@@ -268,7 +269,9 @@ display_controller(struct dev *dev, int model) 
	printf("============================\n");

	for (nsid = spdk_nvme_ctrlr_get_first_active_ns(dev->ctrlr);

	     nsid != 0; nsid = spdk_nvme_ctrlr_get_next_active_ns(dev->ctrlr, nsid)) {

		display_namespace(spdk_nvme_ctrlr_get_ns(dev->ctrlr, nsid));

		ns = spdk_nvme_ctrlr_get_ns(dev->ctrlr, nsid);

		assert(ns != NULL);

		display_namespace(ns);

	}

}