Commit 34369a12 authored by Changpeng Liu's avatar Changpeng Liu Committed by Jim Harris
Browse files

nvme: fix potential null dereference of spdk_nvme_ctrlr_get_ns 



Change-Id: Ibe353e61020caa264cb9b4ad38a091f46ecccfb1
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 07295a81

examples/nvme/arbitration/arbitration.c

+6 −1
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ static void 
register_ctrlr(struct spdk_nvme_ctrlr *ctrlr)

{

	int nsid, num_ns;

	struct spdk_nvme_ns *ns;

	struct ctrlr_entry *entry = calloc(1, sizeof(struct ctrlr_entry));

	const struct spdk_nvme_ctrlr_data *cdata = spdk_nvme_ctrlr_get_data(ctrlr);
@@ -278,7 +279,11 @@ register_ctrlr(struct spdk_nvme_ctrlr *ctrlr) 


	num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr);

	for (nsid = 1; nsid <= num_ns; nsid++) {

		register_ns(ctrlr, spdk_nvme_ctrlr_get_ns(ctrlr, nsid));

		ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);

		if (ns == NULL) {

			continue;

		}

		register_ns(ctrlr, ns);

	}



	if (g_arbitration.arbitration_mechanism == SPDK_NVME_CAP_AMS_WRR) {

examples/nvme/hello_world/hello_world.c

+6 −1
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
{

	int nsid, num_ns;

	struct ctrlr_entry *entry;

	struct spdk_nvme_ns *ns;

	const struct spdk_nvme_ctrlr_data *cdata = spdk_nvme_ctrlr_get_data(ctrlr);



	entry = malloc(sizeof(struct ctrlr_entry));
@@ -276,7 +277,11 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
	num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr);

	printf("Using controller %s with %d namespaces.\n", entry->name, num_ns);

	for (nsid = 1; nsid <= num_ns; nsid++) {

		register_ns(ctrlr, spdk_nvme_ctrlr_get_ns(ctrlr, nsid));

		ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);

		if (ns == NULL) {

			continue;

		}

		register_ns(ctrlr, ns);

	}

}

examples/nvme/nvme_manage/nvme_manage.c

+6 −1
Original line number Diff line number Diff line
@@ -229,6 +229,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				i;
@@ -273,7 +274,11 @@ display_controller(struct dev *dev, int model) 
	printf("Namespace Attributes\n");

	printf("============================\n");

	for (i = 1; i <= spdk_nvme_ctrlr_get_num_ns(dev->ctrlr); i++) {

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

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

		if (ns == NULL) {

			continue;

		}

		display_namespace(ns);

	}

}

examples/nvme/perf/perf.c

+6 −1
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ static void 
register_ctrlr(struct spdk_nvme_ctrlr *ctrlr)

{

	int nsid, num_ns;

	struct spdk_nvme_ns *ns;

	struct ctrlr_entry *entry = malloc(sizeof(struct ctrlr_entry));

	const struct spdk_nvme_ctrlr_data *cdata = spdk_nvme_ctrlr_get_data(ctrlr);
@@ -286,7 +287,11 @@ register_ctrlr(struct spdk_nvme_ctrlr *ctrlr) 


	num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr);

	for (nsid = 1; nsid <= num_ns; nsid++) {

		register_ns(ctrlr, spdk_nvme_ctrlr_get_ns(ctrlr, nsid));

		ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);

		if (ns == NULL) {

			continue;

		}

		register_ns(ctrlr, ns);

	}



}

test/lib/nvme/reset/reset.c

+6 −1
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static void 
register_ctrlr(struct spdk_nvme_ctrlr *ctrlr)

{

	int nsid, num_ns;

	struct spdk_nvme_ns *ns;

	struct ctrlr_entry *entry = malloc(sizeof(struct ctrlr_entry));



	if (entry == NULL) {
@@ -146,7 +147,11 @@ register_ctrlr(struct spdk_nvme_ctrlr *ctrlr) 


	num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr);

	for (nsid = 1; nsid <= num_ns; nsid++) {

		register_ns(ctrlr, spdk_nvme_ctrlr_get_ns(ctrlr, nsid));

		ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);

		if (ns == NULL) {

			continue;

		}

		register_ns(ctrlr, ns);

	}

}