tree: free ctrl attributes when (re)configure ctrl

The trl object can be reused, thus all resources should be freed first.

Suggested-by: Martin George <[email protected]>
Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

src/nvme/tree.c

@@ -2064,11 +2064,30 @@ static void nvme_read_sysfs_tls(nvme_root_t r, nvme_ctrl_t c)
 	free(key);
 }
 
-static int nvme_configure_ctrl(nvme_root_t r, nvme_ctrl_t c, const char *path,
-			       const char *name)
+static int nvme_reconfigure_ctrl(nvme_root_t r, nvme_ctrl_t c, const char *path,
+				 const char *name)
 {
 	DIR *d;
 
+	/*
+	 * It's necesssary to release any resources first because a ctrl
+	 * can be reused.
+	 */
+	nvme_ctrl_release_fd(c);
+	FREE_CTRL_ATTR(c->name);
+	FREE_CTRL_ATTR(c->sysfs_dir);
+	FREE_CTRL_ATTR(c->firmware);
+	FREE_CTRL_ATTR(c->model);
+	FREE_CTRL_ATTR(c->state);
+	FREE_CTRL_ATTR(c->numa_node);
+	FREE_CTRL_ATTR(c->queue_count);
+	FREE_CTRL_ATTR(c->serial);
+	FREE_CTRL_ATTR(c->sqsize);
+	FREE_CTRL_ATTR(c->cntrltype);
+	FREE_CTRL_ATTR(c->cntlid);
+	FREE_CTRL_ATTR(c->dctype);
+	FREE_CTRL_ATTR(c->phy_slot);
+
 	d = opendir(path);
 	if (!d) {
 		nvme_msg(r, LOG_ERR, "Failed to open ctrl dir %s, error %d\n",
@@ -2078,7 +2097,6 @@ static int nvme_configure_ctrl(nvme_root_t r, nvme_ctrl_t c, const char *path,
 	}
 	closedir(d);
 
-	c->fd = -1;
 	c->name = strdup(name);
 	c->sysfs_dir = (char *)path;
 	c->firmware = nvme_get_ctrl_attr(c, "firmware_rev");
@@ -2118,7 +2136,7 @@ int nvme_init_ctrl(nvme_host_t h, nvme_ctrl_t c, int instance)
 		return ret;
 	}
 
-	ret = nvme_configure_ctrl(h->r, c, path, name);
+	ret = nvme_reconfigure_ctrl(h->r, c, path, name);
 	if (ret < 0) {
 		free(path);
 		return ret;
@@ -2240,11 +2258,12 @@ static nvme_ctrl_t nvme_ctrl_alloc(nvme_root_t r, nvme_subsystem_t s,
 		errno = ENODEV;
 		return NULL;
 	}
+	FREE_CTRL_ATTR(c->address);
 	c->address = addr;
 	addr = NULL;
 	if (s->subsystype && !strcmp(s->subsystype, "discovery"))
 		c->discovery_ctrl = true;
-	ret = nvme_configure_ctrl(r, c, path, name);
+	ret = nvme_reconfigure_ctrl(r, c, path, name);
 	return (ret < 0) ? NULL : c;
 }