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

vhost_nvme/rpc: free partially decoded request

Browse Source 
Partially decoded request need to be free even if
spdk_json_decode_object() fails.

Change-Id: Icd00f835537dbaf197cc4f05930be8c543a534a6
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/439716
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
This commit is contained in:
Pawel Wodkowski 2019-01-09 15:15:15 +01:00 committed by Darek Stojaczyk
parent 26979c50c7
commit 1c54ba1c17
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vhost/vhost_rpc.c
View File

@ -686,7 +686,7 @@ static void
spdk_rpc_construct_vhost_nvme_controller(struct spdk_jsonrpc_request *request, spdk_rpc_construct_vhost_nvme_controller(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_vhost_nvme_ctrlr req = {0}; struct rpc_vhost_nvme_ctrlr req = {};
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
int rc; int rc;
@ -699,7 +699,6 @@ spdk_rpc_construct_vhost_nvme_controller(struct spdk_jsonrpc_request *request,
rc = spdk_vhost_nvme_dev_construct(req.ctrlr, req.cpumask, req.io_queues); rc = spdk_vhost_nvme_dev_construct(req.ctrlr, req.cpumask, req.io_queues);
if (rc < 0) { if (rc < 0) {
free_rpc_vhost_nvme_ctrlr(&req);
goto invalid; goto invalid;
} }
@ -715,6 +714,7 @@ spdk_rpc_construct_vhost_nvme_controller(struct spdk_jsonrpc_request *request,
return; return;
invalid: invalid:
free_rpc_vhost_nvme_ctrlr(&req);
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
spdk_strerror(-rc)); spdk_strerror(-rc));