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

nvme: fix potential null dereference of spdk_nvme_ctrlr_get_ns

Browse Source 
Change-Id: Ibe353e61020caa264cb9b4ad38a091f46ecccfb1
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Changpeng Liu 2017-03-24 13:37:22 +08:00 committed by Jim Harris
parent 07295a8155
commit 34369a1243
5 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/nvme/arbitration/arbitration.c
View File

@ -258,6 +258,7 @@ static void
register_ctrlr(struct spdk_nvme_ctrlr *ctrlr)
{
int nsid, num_ns;
struct spdk_nvme_ns *ns;
struct ctrlr_entry *entry = calloc(1, sizeof(struct ctrlr_entry));
const struct spdk_nvme_ctrlr_data *cdata = spdk_nvme_ctrlr_get_data(ctrlr);
@ -278,7 +279,11 @@ register_ctrlr(struct spdk_nvme_ctrlr *ctrlr)
num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr);
for (nsid = 1; nsid <= num_ns; nsid++) {
register_ns(ctrlr, spdk_nvme_ctrlr_get_ns(ctrlr, nsid));
ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);
if (ns == NULL) {
continue;
}
register_ns(ctrlr, ns);
}
if (g_arbitration.arbitration_mechanism == SPDK_NVME_CAP_AMS_WRR) {

7
examples/nvme/hello_world/hello_world.c
View File

@ -249,6 +249,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
{
int nsid, num_ns;
struct ctrlr_entry *entry;
struct spdk_nvme_ns *ns;
const struct spdk_nvme_ctrlr_data *cdata = spdk_nvme_ctrlr_get_data(ctrlr);
entry = malloc(sizeof(struct ctrlr_entry));
@ -276,7 +277,11 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr);
printf("Using controller %s with %d namespaces.\n", entry->name, num_ns);
for (nsid = 1; nsid <= num_ns; nsid++) {
register_ns(ctrlr, spdk_nvme_ctrlr_get_ns(ctrlr, nsid));
ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);
if (ns == NULL) {
continue;
}
register_ns(ctrlr, ns);
}
}

7
examples/nvme/nvme_manage/nvme_manage.c
View File

@ -229,6 +229,7 @@ display_namespace(struct spdk_nvme_ns *ns)
static void
display_controller(struct dev *dev, int model)
{
struct spdk_nvme_ns *ns;
const struct spdk_nvme_ctrlr_data *cdata;
uint8_t str[128];
uint32_t i;
@ -273,7 +274,11 @@ display_controller(struct dev *dev, int model)
printf("Namespace Attributes\n");
printf("============================\n");
for (i = 1; i <= spdk_nvme_ctrlr_get_num_ns(dev->ctrlr); i++) {
display_namespace(spdk_nvme_ctrlr_get_ns(dev->ctrlr, i));
ns = spdk_nvme_ctrlr_get_ns(dev->ctrlr, i);
if (ns == NULL) {
continue;
}
display_namespace(ns);
}
}

7
examples/nvme/perf/perf.c
View File

@ -259,6 +259,7 @@ static void
register_ctrlr(struct spdk_nvme_ctrlr *ctrlr)
{
int nsid, num_ns;
struct spdk_nvme_ns *ns;
struct ctrlr_entry *entry = malloc(sizeof(struct ctrlr_entry));
const struct spdk_nvme_ctrlr_data *cdata = spdk_nvme_ctrlr_get_data(ctrlr);
@ -286,7 +287,11 @@ register_ctrlr(struct spdk_nvme_ctrlr *ctrlr)
num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr);
for (nsid = 1; nsid <= num_ns; nsid++) {
register_ns(ctrlr, spdk_nvme_ctrlr_get_ns(ctrlr, nsid));
ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);
if (ns == NULL) {
continue;
}
register_ns(ctrlr, ns);
}
}

7
test/lib/nvme/reset/reset.c
View File

@ -133,6 +133,7 @@ static void
register_ctrlr(struct spdk_nvme_ctrlr *ctrlr)
{
int nsid, num_ns;
struct spdk_nvme_ns *ns;
struct ctrlr_entry *entry = malloc(sizeof(struct ctrlr_entry));
if (entry == NULL) {
@ -146,7 +147,11 @@ register_ctrlr(struct spdk_nvme_ctrlr *ctrlr)
num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr);
for (nsid = 1; nsid <= num_ns; nsid++) {
register_ns(ctrlr, spdk_nvme_ctrlr_get_ns(ctrlr, nsid));
ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);
if (ns == NULL) {
continue;
}
register_ns(ctrlr, ns);
}
}