Merge pull request #1439 from linux-nvme/fix-scan_subsystem

igaw · web-flow · commit 3d331e1dddf2 · 2022-03-17T09:24:35.000+01:00
nvme-topology: Check if state variable is a valid string
diff --git a/nvme-topology.c b/nvme-topology.c
@@ -384,8 +384,9 @@ static int scan_subsystem(struct nvme_subsystem *s, __u32 ns_instance, int nsid)
 			n->name = strdup(ns[i]->d_name);
 			for (j = 0; j < s->nr_ctrls; j++) {
 				n->ctrl = &s->ctrls[j];
-				if (!strcmp(n->ctrl->state, "live") &&
-						!scan_namespace(n))
+				if (n->ctrl->state &&
+				    !strcmp(n->ctrl->state, "live") &&
+				    !scan_namespace(n))
 					break;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -384,8 +384,9 @@ static int scan_subsystem(struct nvme_subsystem *s, __u32 ns_instance, int nsid)`
`384`	`384`	`n->name = strdup(ns[i]->d_name);`
`385`	`385`	`for (j = 0; j < s->nr_ctrls; j++) {`
`386`	`386`	`n->ctrl = &s->ctrls[j];`
`387`		`- if (!strcmp(n->ctrl->state, "live") &&`
`388`		`- !scan_namespace(n))`
	`387`	`+ if (n->ctrl->state &&`
	`388`	`+ !strcmp(n->ctrl->state, "live") &&`
	`389`	`+ !scan_namespace(n))`
`389`	`390`	`break;`
`390`	`391`	`}`
`391`	`392`	`}`