Merge pull request #356 from hreinecke/coverity

Coverity fixes

Author: hreinecke

examples/telemetry-listen.c

@@ -55,7 +55,6 @@ static void save_telemetry(nvme_ctrl_t c)
 		free(log);
 		return;
 	}
-	log_size = (le16_to_cpu(log->dalb3) + 1) * NVME_LOG_TELEM_BLOCK_SIZE;
 
 	fd = open(buf, O_CREAT|O_WRONLY, S_IRUSR|S_IRGRP);
 	if (fd < 0) {
@@ -77,8 +76,10 @@ static void check_telemetry(nvme_ctrl_t c, int ufd)
 {
 	char buf[0x1000] = { 0 };
 	char *p, *ptr;
+	int len;
 
-	if (read(ufd, buf, sizeof(buf)) < 0)
+	len = read(ufd, buf, sizeof(buf) - 1);
+	if (len < 0)
 		return;
 
 	ptr = buf;
@@ -140,7 +141,7 @@ int main()
 			nvme_subsystem_for_each_ctrl(s, c)
 				i++;
 
-	e = calloc(i, sizeof(e));
+	e = calloc(i, sizeof(struct events));
 	FD_ZERO(&fds);
 	i = 0;
 

src/nvme/fabrics.c

@@ -316,16 +316,19 @@ static int inet6_pton(nvme_root_t r, const char *src, uint16_t port,
 {
 	int ret = -EINVAL;
 	struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)addr;
+	const char *scope = NULL;
+	char *p;
 
 	if (strlen(src) > INET6_ADDRSTRLEN)
 		return -EINVAL;
 
 	char  *tmp = strdup(src);
-	if (!tmp)
+	if (!tmp) {
 		nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+		return -ENOMEM;
+	}
 
-	const char *scope = NULL;
-	char *p = strchr(tmp, '%');
+	p = strchr(tmp, '%');
 	if (p) {
 		*p = '\0';
 		scope = src + (p - tmp) + 1;
@@ -527,7 +530,8 @@ static int __nvmf_add_ctrl(nvme_root_t r, const char *argstr)
 		goto out_close;
 	}
 
-	len = read(fd, buf, sizeof(buf));
+	memset(buf, 0x0, sizeof(buf));
+	len = read(fd, buf, sizeof(buf) - 1);
 	if (len < 0) {
 		nvme_msg(r, LOG_ERR, "Failed to read from %s: %s\n",
 			 nvmf_dev, strerror(errno));
@@ -1262,12 +1266,14 @@ static const char *dctype_str[] = {
  * sysfs. We must get them directly from the controller by performing an
  * identify command.
  */
-static void nvme_fetch_cntrltype_dctype_from_id(nvme_ctrl_t c)
+static int nvme_fetch_cntrltype_dctype_from_id(nvme_ctrl_t c)
 {
 	struct nvme_id_ctrl id = { 0 };
+	int ret;
 
-	if (nvme_ctrl_identify(c, &id))
-		return;
+	ret = nvme_ctrl_identify(c, &id);
+	if (ret)
+		return ret;
 
 	if (!c->cntrltype) {
 		if (id.cntrltype > NVME_CTRL_CNTRLTYPE_ADMIN || !cntrltype_str[id.cntrltype])
@@ -1282,12 +1288,14 @@ static void nvme_fetch_cntrltype_dctype_from_id(nvme_ctrl_t c)
 		else
 			c->dctype = strdup(dctype_str[id.dctype]);
 	}
+	return 0;
 }
 
 bool nvmf_is_registration_supported(nvme_ctrl_t c)
 {
 	if (!c->cntrltype || !c->dctype)
-		nvme_fetch_cntrltype_dctype_from_id(c);
+		if (nvme_fetch_cntrltype_dctype_from_id(c))
+			return false;
 
 	return !strcmp(c->dctype, "ddc") || !strcmp(c->dctype, "cdc");
 }

src/nvme/tree.c

@@ -578,6 +578,7 @@ static int nvme_scan_subsystem(struct nvme_root *r, const char *name,
 		nvme_msg(r, LOG_WARNING, "NQN mismatch for subsystem '%s'\n",
 			 name);
 		s = NULL;
+		free(subsysnqn);
 		errno = EINVAL;
 		return -1;
 	}
@@ -1092,20 +1093,26 @@ static char *nvme_ctrl_lookup_subsystem_name(nvme_root_t r,
 	struct dirent **subsys;
 	char *subsys_name = NULL;
 	int ret, i;
-	char path[PATH_MAX];
 
 	ret = nvme_scan_subsystems(&subsys);
 	if (ret < 0)
 		return NULL;
 	for (i = 0; i < ret; i++) {
 		struct stat st;
+		char *path;
 
-		sprintf(path, "%s/%s/%s", nvme_subsys_sysfs_dir,
-			subsys[i]->d_name, ctrl_name);
+		if (asprintf(&path, "%s/%s/%s", nvme_subsys_sysfs_dir,
+			     subsys[i]->d_name, ctrl_name) < 0) {
+			errno = ENOMEM;
+			return NULL;
+		}
 		nvme_msg(r, LOG_DEBUG, "lookup subsystem %s\n", path);
-		if (stat(path, &st) < 0)
+		if (stat(path, &st) < 0) {
+			free(path);
 			continue;
+		}
 		subsys_name = strdup(subsys[i]->d_name);
+		free(path);
 		break;
 	}
 	nvme_free_dirents(subsys, ret);
@@ -1293,12 +1300,10 @@ static nvme_ctrl_t nvme_ctrl_alloc(nvme_root_t r, nvme_subsystem_t s,
 	free(transport);
 	if (address)
 		free(address);
-	if (!c) {
-		if (!p) {
-			nvme_msg(r, LOG_ERR, "failed to lookup ctrl\n");
-			errno = ENODEV;
-		} else
-			errno = ENOMEM;
+	if (!c && !p) {
+		nvme_msg(r, LOG_ERR, "failed to lookup ctrl\n");
+		errno = ENODEV;
+		free(addr);
 		return NULL;
 	}
 	c->address = addr;
@@ -1360,6 +1365,7 @@ nvme_ctrl_t nvme_scan_ctrl(nvme_root_t r, const char *name)
 		nvme_msg(r, LOG_ERR,
 			 "failed to lookup subsystem for controller %s\n",
 			 name);
+		free(subsysnqn);
 		free(path);
 		errno = ENXIO;
 		return NULL;

test/zns.c

@@ -40,6 +40,7 @@ static void show_zns_properties(nvme_ns_t n)
 
 	if (nvme_zns_identify_ctrl(nvme_ns_get_fd(n), &zns_ctrl)) {
 		fprintf(stderr, "failed to identify zns ctrl\n");;
+		free(zr);
 		return;
 	}
 
@@ -51,6 +52,7 @@ static void show_zns_properties(nvme_ns_t n)
 				  NVME_DEFAULT_IOCTL_TIMEOUT, &result)) {
 		fprintf(stderr, "failed to report zones, result %x\n",
 			le32_to_cpu(result));
+		free(zr);
 		return;
 	}