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

nvme/rdma: bounds check discovery log page numrec

Browse Source 
Change-Id: Ic7bcd6b7f42510be68f70fb3526a344754ecbbc0
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-12-12 16:02:50 -07:00
parent 03be4c1c59
commit 32e6dd1573
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/nvme/nvme_rdma.c
View File

@ -1100,7 +1100,7 @@ nvme_rdma_ctrlr_scan(const struct spdk_nvme_transport_id *discovery_trid,
union spdk_nvme_cc_register cc; union spdk_nvme_cc_register cc;
char buffer[4096]; char buffer[4096];
int rc; int rc;
uint32_t i; uint64_t i, numrec, buffer_max_entries;
spdk_nvme_ctrlr_opts_set_defaults(&discovery_opts); spdk_nvme_ctrlr_opts_set_defaults(&discovery_opts);
/* For discovery_ctrlr set the timeout to 0 */ /* For discovery_ctrlr set the timeout to 0 */
@ -1133,7 +1133,21 @@ nvme_rdma_ctrlr_scan(const struct spdk_nvme_transport_id *discovery_trid,
} }
log_page = (struct spdk_nvmf_discovery_log_page *)buffer; log_page = (struct spdk_nvmf_discovery_log_page *)buffer;
for (i = 0; i < log_page->numrec; i++) {
/*
* For now, only support retrieving one buffer of discovery entries.
* This could be extended to call Get Log Page multiple times as needed.
*/
buffer_max_entries = (sizeof(buffer) - offsetof(struct spdk_nvmf_discovery_log_page, entries[0])) /
sizeof(struct spdk_nvmf_discovery_log_page_entry);
numrec = nvme_min(log_page->numrec, buffer_max_entries);
if (numrec != log_page->numrec) {
SPDK_WARNLOG("Discovery service returned %" PRIu64 " entries,"
"but buffer can only hold %" PRIu64 "\n",
log_page->numrec, numrec);
}
for (i = 0; i < numrec; i++) {
struct spdk_nvmf_discovery_log_page_entry *entry = &log_page->entries[i]; struct spdk_nvmf_discovery_log_page_entry *entry = &log_page->entries[i];
uint8_t *end; uint8_t *end;
size_t len; size_t len;
@ -1160,7 +1174,7 @@ nvme_rdma_ctrlr_scan(const struct spdk_nvme_transport_id *discovery_trid,
/* Ensure that subnqn is null terminated. */ /* Ensure that subnqn is null terminated. */
end = memchr(entry->subnqn, '\0', SPDK_NVMF_NQN_MAX_LEN); end = memchr(entry->subnqn, '\0', SPDK_NVMF_NQN_MAX_LEN);
if (!end) { if (!end) {
SPDK_ERRLOG("Discovery entry %u: SUBNQN is not null terminated\n", i); SPDK_ERRLOG("Discovery entry %" PRIu64 ": SUBNQN is not null terminated\n", i);
continue; continue;
} }
len = end - entry->subnqn; len = end - entry->subnqn;