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

lib/nvmf: fix req->data usage in nvmf_ctrlr_get_features() handlers

Browse Source 
This code has a similar potential problem as the identify
and log page commands did: stop using req->data in favour of IOVs.

We also need to fix the unit tests to initialize the iovs.

We don't change the existing "set" behaviour of requiring a single IOV
here.

Signed-off-by: John Levon <john.levon@nutanix.com>
Change-Id: I257567a7abd5fc3ed9ee21b432c7da7d70fbbde0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16122
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Thanos Makatos <thanos.makatos@nutanix.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
John Levon 2023-01-04 10:28:07 +00:00 committed by Jim Harris
parent acc4d1766c
commit ad5217307e
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/nvmf/ctrlr.c
View File

@ -1687,6 +1687,7 @@ nvmf_ctrlr_get_features_host_identifier(struct spdk_nvmf_request *req)
struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr; struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;
struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd; struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl; struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl;
struct copy_iovs_ctx copy_ctx;
SPDK_DEBUGLOG(nvmf, "Get Features - Host Identifier\n"); SPDK_DEBUGLOG(nvmf, "Get Features - Host Identifier\n");
@ -1703,7 +1704,9 @@ nvmf_ctrlr_get_features_host_identifier(struct spdk_nvmf_request *req)
return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE; return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
} }
spdk_uuid_copy((struct spdk_uuid *)req->data, &ctrlr->hostid); _init_copy_iovs_ctx(&copy_ctx, req->iov, req->iovcnt);
_copy_buf_to_iovs(&copy_ctx, &ctrlr->hostid, sizeof(ctrlr->hostid));
return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE; return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
} }
@ -1830,6 +1833,7 @@ nvmf_ctrlr_get_features_host_behavior_support(struct spdk_nvmf_request *req)
struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr; struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;
struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl; struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl;
struct spdk_nvme_host_behavior host_behavior = {}; struct spdk_nvme_host_behavior host_behavior = {};
struct copy_iovs_ctx copy_ctx;
SPDK_DEBUGLOG(nvmf, "Get Features - Host Behavior Support\n"); SPDK_DEBUGLOG(nvmf, "Get Features - Host Behavior Support\n");
@ -1841,7 +1845,9 @@ nvmf_ctrlr_get_features_host_behavior_support(struct spdk_nvmf_request *req)
} }
host_behavior.acre = ctrlr->acre_enabled; host_behavior.acre = ctrlr->acre_enabled;
memcpy(req->data, &host_behavior, sizeof(host_behavior));
_init_copy_iovs_ctx(&copy_ctx, req->iov, req->iovcnt);
_copy_buf_to_iovs(&copy_ctx, &host_behavior, sizeof(host_behavior));
return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE; return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
} }

11
test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
View File

@ -2766,8 +2766,10 @@ test_nvmf_ctrlr_get_features_host_behavior_support(void)
req.rsp = &rsp; req.rsp = &rsp;
/* Invalid data */ /* Invalid data */
req.data = NULL;
req.length = sizeof(struct spdk_nvme_host_behavior); req.length = sizeof(struct spdk_nvme_host_behavior);
req.data = NULL;
req.iovcnt = 0;
rc = nvmf_ctrlr_get_features_host_behavior_support(&req); rc = nvmf_ctrlr_get_features_host_behavior_support(&req);
CU_ASSERT(rc == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE); CU_ASSERT(rc == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE);
@ -2778,6 +2780,9 @@ test_nvmf_ctrlr_get_features_host_behavior_support(void)
/* Wrong structure length */ /* Wrong structure length */
req.data = &behavior; req.data = &behavior;
req.length = sizeof(struct spdk_nvme_host_behavior) - 1; req.length = sizeof(struct spdk_nvme_host_behavior) - 1;
req.iovcnt = 1;
req.iov[0].iov_base = req.data;
req.iov[0].iov_len = req.length;
rc = nvmf_ctrlr_get_features_host_behavior_support(&req); rc = nvmf_ctrlr_get_features_host_behavior_support(&req);
CU_ASSERT(rc == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE); CU_ASSERT(rc == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE);
@ -2787,6 +2792,10 @@ test_nvmf_ctrlr_get_features_host_behavior_support(void)
/* Get Features Host Behavior Support Success */ /* Get Features Host Behavior Support Success */
req.data = &behavior; req.data = &behavior;
req.length = sizeof(struct spdk_nvme_host_behavior); req.length = sizeof(struct spdk_nvme_host_behavior);
req.iovcnt = 1;
req.iov[0].iov_base = req.data;
req.iov[0].iov_len = req.length;
ctrlr.acre_enabled = true; ctrlr.acre_enabled = true;
host_behavior = (struct spdk_nvme_host_behavior *)req.data; host_behavior = (struct spdk_nvme_host_behavior *)req.data;
host_behavior->acre = false; host_behavior->acre = false;