Skip to contentSkip to conversation

address some open scan hub warnings

PATCH In review [email protected] 3 participants 7 messages Aug 20, 2024 – Aug 21, 2024 libnvdimm: non-volatile memory device

lore
Share & tools
lore
#0 lore raw

These issues are pretty minor, but probably worth fixing.

[PATCH ndctl 1/2] ndctl/keys.c: don't leak fd in error cases [PATCH ndctl 2/2] libndctl.c: major and minor numbers are unsigned

#1 lore raw

PATCH 1/2 ndctl/keys.c: don't leak fd in error cases

From: Jeff Moyer <[email protected]>

Static analysis points out that fd is leaked in some cases. The change to the while loop is optional. I only did that to make the code consistent.

---
 ndctl/keys.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
ndctl/keys.c +8 -8
index 2c1f474..cc55204 100644
@@ -108,7 +108,7 @@ char *ndctl_load_key_blob(const char *path, int *size, const char *postfix,
 	struct stat st;
 	ssize_t read_bytes = 0;
 	int rc, fd;
-	char *blob, *pl, *rdptr;
+	char *blob = NULL, *pl, *rdptr;
 	char prefix[] = "load ";
 	bool need_prefix = false;
 
@@ -125,16 +125,16 @@ char *ndctl_load_key_blob(const char *path, int *size, const char *postfix,
 	rc = fstat(fd, &st);
 	if (rc < 0) {
 		fprintf(stderr, "stat: %s\n", strerror(errno));
-		return NULL;
+		goto out_close;
 	}
 	if ((st.st_mode & S_IFMT) != S_IFREG) {
 		fprintf(stderr, "%s not a regular file\n", path);
-		return NULL;
+		goto out_close;
 	}
 
 	if (st.st_size == 0 || st.st_size > 4096) {
 		fprintf(stderr, "Invalid blob file size\n");
-		return NULL;
+		goto out_close;
 	}
 
 	*size = st.st_size;
@@ -166,15 +166,13 @@ char *ndctl_load_key_blob(const char *path, int *size, const char *postfix,
 			fprintf(stderr, "Failed to read from blob file: %s\n",
 					strerror(errno));
 			free(blob);
-			close(fd);
-			return NULL;
+			blob = NULL;
+			goto out_close;
 		}
 		read_bytes += rc;
 		rdptr += rc;
 	} while (read_bytes != st.st_size);
 
-	close(fd);
-
 	if (postfix) {
 		pl += read_bytes;
 		*pl = ' ';
@@ -182,6 +180,8 @@ char *ndctl_load_key_blob(const char *path, int *size, const char *postfix,
 		rc = sprintf(pl, "keyhandle=%s", postfix);
 	}
 
+out_close:
+	close(fd);
 	return blob;
 }
 
Signature · 1 line
2.43.5
maintainer Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH ndctl 1/2] ndctl/keys.c: don't leak fd in error cases

Quoted 7 lines · On 8/20/24 11:26 AM, [email protected] wrote:

From: Jeff Moyer <[email protected]>

Static analysis points out that fd is leaked in some cases. The change to the while loop is optional. I only did that to make the code consistent.

Quoted 64 lines
---
 ndctl/keys.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
ndctl/keys.c +8 -8
index 2c1f474..cc55204 100644
@@ -108,7 +108,7 @@ char *ndctl_load_key_blob(const char *path, int *size, const char *postfix,
 	struct stat st;
 	ssize_t read_bytes = 0;
 	int rc, fd;
-	char *blob, *pl, *rdptr;
+	char *blob = NULL, *pl, *rdptr;
 	char prefix[] = "load ";
 	bool need_prefix = false;
 
@@ -125,16 +125,16 @@ char *ndctl_load_key_blob(const char *path, int *size, const char *postfix,
 	rc = fstat(fd, &st);
 	if (rc < 0) {
 		fprintf(stderr, "stat: %s\n", strerror(errno));
-		return NULL;
+		goto out_close;
 	}
 	if ((st.st_mode & S_IFMT) != S_IFREG) {
 		fprintf(stderr, "%s not a regular file\n", path);
-		return NULL;
+		goto out_close;
 	}
 
 	if (st.st_size == 0 || st.st_size > 4096) {
 		fprintf(stderr, "Invalid blob file size\n");
-		return NULL;
+		goto out_close;
 	}
 
 	*size = st.st_size;
@@ -166,15 +166,13 @@ char *ndctl_load_key_blob(const char *path, int *size, const char *postfix,
 			fprintf(stderr, "Failed to read from blob file: %s\n",
 					strerror(errno));
 			free(blob);
-			close(fd);
-			return NULL;
+			blob = NULL;
+			goto out_close;
 		}
 		read_bytes += rc;
 		rdptr += rc;
 	} while (read_bytes != st.st_size);
 
-	close(fd);
-
 	if (postfix) {
 		pl += read_bytes;
 		*pl = ' ';
@@ -182,6 +180,8 @@ char *ndctl_load_key_blob(const char *path, int *size, const char *postfix,
 		rc = sprintf(pl, "keyhandle=%s", postfix);
 	}
 
+out_close:
+	close(fd);
 	return blob;
 }
 
maintainer Reviewed-by on v1 1/2
#3 lore raw

Re: [PATCH ndctl 1/2] ndctl/keys.c: don't leak fd in error cases

In reply to [email protected]
Quoted 7 lines · On Tue, 2024-08-20 at 14:26 -0400, [email protected] wrote:

From: Jeff Moyer <[email protected]>

Static analysis points out that fd is leaked in some cases.  The change to the while loop is optional.  I only did that to make the code consistent.

Looks good,

Quoted 69 lines

---
 ndctl/keys.c | 16 ++++++++--------

 1 file changed, 8 insertions(+), 8 deletions(-)
ndctl/keys.c +1 -1
index 2c1f474..cc55204 100644
@@ -108,7 +108,7 @@ char *ndctl_load_key_blob(const char *path, int
 *size, const char *postfix,
  	struct stat st;
  	ssize_t read_bytes = 0;
  	int rc, fd;
-	char *blob, *pl, *rdptr;
+	char *blob = NULL, *pl, *rdptr;
  	char prefix[] = "load ";
  	bool need_prefix = false;

ndctl/keys.c +2 -2
@@ -125,16 +125,16 @@ char *ndctl_load_key_blob(const char *path, int
 *size, const char *postfix,
  	rc = fstat(fd, &st);
  	if (rc < 0) {
  		fprintf(stderr, "stat: %s\n", strerror(errno));
-		return NULL;
+		goto out_close;
  	}
  	if ((st.st_mode & S_IFMT) != S_IFREG) {
  		fprintf(stderr, "%s not a regular file\n", path);
-		return NULL;
+		goto out_close;
  	}


  if (st.st_size == 0 || st.st_size > 4096) { fprintf(stderr, "Invalid blob file size\n");

ndctl/keys.c +1 -1
-		return NULL;
+		goto out_close;

  }

  *size = st.st_size;

ndctl/keys.c +0 -0
@@ -166,15 +166,13 @@ char *ndctl_load_key_blob(const char *path, int
 *size, const char *postfix,

  fprintf(stderr, "Failed to read from blob
file: %s\n",
  strerror(errno)); free(blob);

ndctl/keys.c +2 -2
-			close(fd);
-			return NULL;
+			blob = NULL;
+			goto out_close;

  }
  read_bytes += rc;
  rdptr += rc;
  } while (read_bytes != st.st_size);

ndctl/keys.c +0 -2
-	close(fd);
-

  if (postfix) {
  pl += read_bytes;
  *pl = ' ';

ndctl/keys.c +0 -0
@@ -182,6 +180,8 @@ char *ndctl_load_key_blob(const char *path, int
 *size, const char *postfix,
  		rc = sprintf(pl, "keyhandle=%s", postfix);
  	}

ndctl/keys.c +2 -0
+out_close:
+	close(fd);

  return blob;
 }

#4 lore raw

PATCH 2/2 libndctl.c: major and minor numbers are unsigned

In reply to [email protected]

From: Jeff Moyer <[email protected]>

Static analysis points out that the cast of bus->major and bus->minor to a signed type in the call to parent_dev_path could result in a negative number. I sincerely doubt we'll see major and minor numbers that large, but let's fix it.

---
 ndctl/lib/libndctl.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
ndctl/lib/libndctl.c +4 -3
index ddbdd9a..f75dbd4 100644
@@ -710,11 +710,12 @@ NDCTL_EXPORT void ndctl_set_log_priority(struct ndctl_ctx *ctx, int priority)
 	daxctl_set_log_priority(ctx->daxctl_ctx, priority);
 }
 
-static char *__dev_path(char *type, int major, int minor, int parent)
+static char *__dev_path(char *type, unsigned int major, unsigned int minor,
+			int parent)
 {
 	char *path, *dev_path;
 
-	if (asprintf(&path, "/sys/dev/%s/%d:%d%s", type, major, minor,
+	if (asprintf(&path, "/sys/dev/%s/%u:%u%s", type, major, minor,
 				parent ? "/device" : "") < 0)
 		return NULL;
 
@@ -723,7 +724,7 @@ static char *__dev_path(char *type, int major, int minor, int parent)
 	return dev_path;
 }
 
-static char *parent_dev_path(char *type, int major, int minor)
+static char *parent_dev_path(char *type, unsigned int major, unsigned int minor)
 {
         return __dev_path(type, major, minor, 1);
 }
Signature · 1 line
2.43.5
maintainer Reviewed-by on v1 2/2
#5 lore raw

Re: [PATCH ndctl 2/2] libndctl.c: major and minor numbers are unsigned

Quoted 8 lines · On 8/20/24 11:26 AM, [email protected] wrote:

From: Jeff Moyer <[email protected]>

Static analysis points out that the cast of bus->major and bus->minor to a signed type in the call to parent_dev_path could result in a negative number. I sincerely doubt we'll see major and minor numbers that large, but let's fix it.

Quoted 32 lines
---
 ndctl/lib/libndctl.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
ndctl/lib/libndctl.c +4 -3
index ddbdd9a..f75dbd4 100644
@@ -710,11 +710,12 @@ NDCTL_EXPORT void ndctl_set_log_priority(struct ndctl_ctx *ctx, int priority)
 	daxctl_set_log_priority(ctx->daxctl_ctx, priority);
 }
 
-static char *__dev_path(char *type, int major, int minor, int parent)
+static char *__dev_path(char *type, unsigned int major, unsigned int minor,
+			int parent)
 {
 	char *path, *dev_path;
 
-	if (asprintf(&path, "/sys/dev/%s/%d:%d%s", type, major, minor,
+	if (asprintf(&path, "/sys/dev/%s/%u:%u%s", type, major, minor,
 				parent ? "/device" : "") < 0)
 		return NULL;
 
@@ -723,7 +724,7 @@ static char *__dev_path(char *type, int major, int minor, int parent)
 	return dev_path;
 }
 
-static char *parent_dev_path(char *type, int major, int minor)
+static char *parent_dev_path(char *type, unsigned int major, unsigned int minor)
 {
         return __dev_path(type, major, minor, 1);
 }
maintainer Reviewed-by on v1 2/2
#6 lore raw

Re: [PATCH ndctl 2/2] libndctl.c: major and minor numbers are unsigned

In reply to [email protected]
Quoted 8 lines · On Tue, 2024-08-20 at 14:26 -0400, [email protected] wrote:

From: Jeff Moyer <[email protected]>

Static analysis points out that the cast of bus->major and bus->minor to a signed type in the call to parent_dev_path could result in a negative number.  I sincerely doubt we'll see major and minor numbers that large, but let's fix it.

Looks good,

Quoted 39 lines

---
 ndctl/lib/libndctl.c | 7 ++++---

 1 file changed, 4 insertions(+), 3 deletions(-)
ndctl/lib/libndctl.c +0 -0
index ddbdd9a..f75dbd4 100644
@@ -710,11 +710,12 @@ NDCTL_EXPORT void ndctl_set_log_priority(struct
 ndctl_ctx *ctx, int priority)
  	daxctl_set_log_priority(ctx->daxctl_ctx, priority);
  }


-static char *__dev_path(char *type, int major, int minor, int parent)
+static char *__dev_path(char *type, unsigned int major, unsigned int minor,

ndctl/lib/libndctl.c +1 -0
+			int parent)

 {
  char *path, *dev_path;

ndctl/lib/libndctl.c +0 -1
-	if (asprintf(&path, "/sys/dev/%s/%d:%d%s", type, major,

minor,

ndctl/lib/libndctl.c +1 -0
+	if (asprintf(&path, "/sys/dev/%s/%u:%u%s", type, major,

minor,
  parent ? "/device" : "") < 0) return NULL;

ndctl/lib/libndctl.c +0 -0
@@ -723,7 +724,7 @@ static char *__dev_path(char *type, int major,
 int minor, int parent)
  	return dev_path;
  }

ndctl/lib/libndctl.c +1 -1
-static char *parent_dev_path(char *type, int major, int minor)
+static char *parent_dev_path(char *type, unsigned int major,

unsigned int minor)
 {
         return __dev_path(type, major, minor, 1); }