Commit a8430987 authored by Alexey Marchuk's avatar Alexey Marchuk Committed by Tomasz Zawadzki
Browse files

nvme: Cleanup resources when memory allocation fails 



Several resources remain allocated when malloc fails.

Change-Id: I2b6df59978100833a91915c3267f3a54f6fc0de4
Signed-off-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1336


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent c0db2b6d

lib/nvme/nvme_ctrlr.c

+3 −1
Original line number Diff line number Diff line
@@ -548,6 +548,7 @@ static int nvme_ctrlr_set_intel_support_log_pages(struct spdk_nvme_ctrlr *ctrlr) 
	status = malloc(sizeof(*status));

	if (!status) {

		SPDK_ERRLOG("Failed to allocate status tracker\n");

		spdk_free(log_page_directory);

		return -ENOMEM;

	}
@@ -1312,6 +1313,7 @@ nvme_ctrlr_identify_active_ns(struct spdk_nvme_ctrlr *ctrlr) 
	status = malloc(sizeof(*status));

	if (!status) {

		SPDK_ERRLOG("Failed to allocate status tracker\n");

		spdk_free(new_ns_list);

		return -ENOMEM;

	}
@@ -2989,7 +2991,7 @@ spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_dat 
	status = malloc(sizeof(*status));

	if (!status) {

		SPDK_ERRLOG("Failed to allocate status tracker\n");

		return -ENOMEM;

		return 0;

	}



	res = nvme_ctrlr_cmd_create_ns(ctrlr, payload, nvme_completion_poll_cb, status);

lib/nvme/nvme_fabric.c

+4 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ nvme_fabric_ctrlr_scan(struct spdk_nvme_probe_ctx *probe_ctx, 
	status = malloc(sizeof(*status));

	if (!status) {

		SPDK_ERRLOG("Failed to allocate status tracker\n");

		nvme_ctrlr_destruct(discovery_ctrlr);

		return -ENOMEM;

	}
@@ -306,12 +307,14 @@ nvme_fabric_ctrlr_scan(struct spdk_nvme_probe_ctx *probe_ctx, 
				     nvme_completion_poll_cb, status);

	if (rc != 0) {

		SPDK_ERRLOG("Failed to identify cdata\n");

		nvme_ctrlr_destruct(discovery_ctrlr);

		free(status);

		return rc;

	}



	if (spdk_nvme_wait_for_completion(discovery_ctrlr->adminq, status)) {

		SPDK_ERRLOG("nvme_identify_controller failed!\n");

		nvme_ctrlr_destruct(discovery_ctrlr);

		if (!status->timed_out) {

			free(status);

		}
@@ -413,6 +416,7 @@ nvme_fabric_qpair_connect(struct spdk_nvme_qpair *qpair, uint32_t num_entries) 
	status = malloc(sizeof(*status));

	if (!status) {

		SPDK_ERRLOG("Failed to allocate status tracker\n");

		spdk_free(nvmf_data);

		return -ENOMEM;

	}