ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: fix memleak when submit request failed

Browse Source 
Some memory alloc in nvme_allocate_request_user_copy, and submit
through nvme_qpair_submit_request, if nvme ctrlr is failed or
qpair state not meet the requirements, submit will return -ENXIO,
and call nvme_free_request(), but it will not free
req->payload.contig_or_cb_arg, those memory only gets freed when the
request is actually completed, through nvme_user_copy_cmd_complete().
Let's fix this by add check when submit failed.

Fixes issue #2832
Change-Id: I54f0fc60dbb53ced9f52da7d89017be13db2eee1
Signed-off-by: Fengnan Chang <changfengnan@bytedance.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15985
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Xiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Fengnan Chang 2023-01-05 10:36:17 +08:00 committed by Jim Harris
parent 02ecb2dcba
commit 958d4e0e05
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nvme/nvme_ctrlr.c
View File

@ -3362,7 +3362,9 @@ nvme_ctrlr_cleanup_process(struct spdk_nvme_ctrlr_process *proc)
STAILQ_REMOVE(&proc->active_reqs, req, nvme_request, stailq); STAILQ_REMOVE(&proc->active_reqs, req, nvme_request, stailq);
assert(req->pid == proc->pid); assert(req->pid == proc->pid);
if (req->user_buffer && req->payload_size) {
spdk_free(req->payload.contig_or_cb_arg);
}
nvme_free_request(req); nvme_free_request(req);
} }

4
lib/nvme/nvme_pcie_common.c
View File

@ -291,7 +291,9 @@ nvme_pcie_qpair_insert_pending_admin_request(struct spdk_nvme_qpair *qpair,
} else { } else {
SPDK_ERRLOG("The owning process (pid %d) is not found. Dropping the request.\n", SPDK_ERRLOG("The owning process (pid %d) is not found. Dropping the request.\n",
active_req->pid); active_req->pid);
if (active_req->user_buffer && active_req->payload_size) {
spdk_free(active_req->payload.contig_or_cb_arg);
}
nvme_free_request(active_req); nvme_free_request(active_req);
} }
} }

4
lib/nvme/nvme_qpair.c
View File

@ -1049,6 +1049,10 @@ error:
return rc; return rc;
} }
if (req->user_buffer && req->payload_size) {
spdk_free(req->payload.contig_or_cb_arg);
}
nvme_free_request(req); nvme_free_request(req);
return rc; return rc;