File Replace-snprintf-with-asprintf-for-string-handl... of Package target-isns

Overview Repositories Revisions Requests Users Attributes Meta

File Replace-snprintf-with-asprintf-for-string-handling.patch of Package target-isns (Revision 39aa87514453780d8493711186a5dc71)

Currently displaying revision 39aa87514453780d8493711186a5dc71 , Show latest

From de826ee1bb14a2f48bf082017598e0816fffbbb8 Mon Sep 17 00:00:00 2001
From: Lee Duncan <lduncan@suse.com>
Date: Fri, 15 Jun 2018 17:29:30 -0700
Subject: [PATCH] Replace snprintf with asprintf for string handling

This also makes the gcc8 compiler happy, and avoids possible
problems with strings actually being truncated.
--- 
diff -aurp target-isns-0.6.4.orig/src/configfs.c target-isns-0.6.4/src/configfs.c
--- target-isns-0.6.4.orig/src/configfs.c	2018-01-20 12:23:46.000000000 -0800
+++ target-isns-0.6.4/src/configfs.c	2018-06-15 18:07:26.541537030 -0700
@@ -31,6 +31,8 @@
  *   +-- $IQN N                         W   +-- target N
  */
 
+#define _GNU_SOURCE
+
 #include "configfs.h"
 
 #include <ccan/list/list.h>
@@ -115,12 +117,13 @@ static struct tpg *tpg_find_by_watch(con
 static struct target *configfs_target_init(const char *name)
 {
 	struct target *tgt;
-	char path[512];
+	char *path;
 
 	if ((tgt = malloc(sizeof(struct target))) == NULL)
 		return NULL;
 
-	snprintf(path, sizeof(path), "%s/%s", config.configfs_iscsi_path, name);
+	if (asprintf(&path, "%s/%s", config.configfs_iscsi_path, name) < 0)
+		return NULL;
 	strncpy(tgt->name, name, ISCSI_NAME_SIZE);
 	tgt->name[ISCSI_NAME_SIZE - 1] = '\0';
 	tgt->exists = false;
@@ -128,26 +131,33 @@ static struct target *configfs_target_in
 	tgt->watch_fd = inotify_add_watch(inotify_fd, path, INOTIFY_MASK);
 	list_head_init(&tgt->tpgs);
 	list_add_tail(&targets, &tgt->node);
+	free(path);
 
 	return tgt;
 }
 
 static bool configfs_tpg_enabled(const struct target *tgt, uint16_t tpg_tag)
 {
-	int fd;
+	int fd = -1;
 	ssize_t nr;
-	char buf[8], path[512];
+	char buf[8];
+	char *path = NULL;
 	bool enabled = false;
 
-	snprintf(path, sizeof(path),
-		 "%s/%s/tpgt_%hu/enable",
-		 config.configfs_iscsi_path, tgt->name, tpg_tag);
+	if (asprintf(&path, "%s/%s/tpgt_%hu/enable",
+		     config.configfs_iscsi_path, tgt->name, tpg_tag) < 0)
+		goto dun;
 	if ((fd = open(path, O_RDONLY)) == -1)
-		return false;
+		goto dun;
 	if ((nr = read(fd, buf, sizeof(buf))) != -1) {
 		enabled = buf[0] == '1';
 	}
-	close(fd);
+
+dun:
+	if (fd >= 0)
+		close(fd);
+	if (path)
+		free(path);
 
 	return enabled;
 }
@@ -155,20 +165,32 @@ static bool configfs_tpg_enabled(const s
 static struct tpg *configfs_tpg_init(struct target *tgt, uint16_t tpg_tag)
 {
 	struct tpg *tpg = malloc(sizeof(struct tpg));
-	char path[512];
-	char np_path[512];
+	char *path;
+	char *np_path;
 
-	snprintf(path, sizeof(path), "%s/%s/tpgt_%hu",
-		 config.configfs_iscsi_path, tgt->name, tpg_tag);
-	snprintf(np_path, sizeof(np_path), "%s/np", path);
+	if (asprintf(&path, "%s/%s/tpgt_%hu",
+		     config.configfs_iscsi_path, tgt->name, tpg_tag) < 0)
+		goto err_out;
+	if (asprintf(&np_path, "%s/np", path) < 0)
+		goto err_out;
 	tpg->watch_fd = inotify_add_watch(inotify_fd, path, INOTIFY_MASK);
 	tpg->np_watch_fd = inotify_add_watch(inotify_fd, np_path, INOTIFY_MASK);
 	tpg->tag = tpg_tag;
 	tpg->enabled = configfs_tpg_enabled(tgt, tpg_tag);
 	tpg->exists = false;
 	list_add(&tgt->tpgs, &tpg->node);
+	free(path);
+	free(np_path);
 
 	return tpg;
+
+err_out:
+	if (path)
+		free(path);
+	if (np_path)
+		free(np_path);
+	free(tpg);
+	return NULL;
 }
 
 static int get_portal(const char *str, int *af, char *ip_addr, uint16_t *port)
@@ -248,12 +270,14 @@ static int configfs_tpg_update(struct ta
 {
 	DIR *np_dir;
 	struct dirent *dirent;
-	char np_path[512];
+	char *np_path;
+
+	if (asprintf(&np_path, "%s/%s/tpgt_%hu/np",
+		     config.configfs_iscsi_path, tgt->name, tpg->tag) < 0)
+		return -ENOMEM;
 
-	snprintf(np_path, sizeof(np_path),
-		 "%s/%s/tpgt_%hu/np",
-		 config.configfs_iscsi_path, tgt->name, tpg->tag);
 	np_dir = opendir(np_path);
+	free(np_path);
 	if (!np_dir)
 		return -ENOENT;
 
@@ -293,11 +317,13 @@ static int configfs_target_update(struct
 	struct tpg *tpg, *tpg_next;
 	struct tpg_portal *tpg_portal, *tpg_portal_next;
 	uint16_t tpg_tag;
-	char tgt_path[512];
+	char *tgt_path;
 
-	snprintf(tgt_path, sizeof(tgt_path), "%s/%s",
-		 config.configfs_iscsi_path, tgt->name);
+	if (asprintf(&tgt_path, "%s/%s",
+		    config.configfs_iscsi_path, tgt->name) < 0)
+		return -ENOMEM;
 	tgt_dir = opendir(tgt_path);
+	free(tgt_path);
 	if (!tgt_dir)
 		return -ENOENT;
 
@@ -314,6 +340,8 @@ static int configfs_target_update(struct
 
 		if (!tpg)
 			tpg = configfs_tpg_init(tgt, tpg_tag);
+		if (!tpg)
+			return -ENOMEM;
 		configfs_tpg_update(tgt, tpg);
 		tpg->exists = true;
 	}
@@ -366,6 +394,8 @@ int configfs_inotify_init(void)
 		tgt = target_find(dirent->d_name);
 		if (!tgt)
 			tgt = configfs_target_init(dirent->d_name);
+		if (!tgt)
+			goto out;
 		configfs_target_update(tgt);
 	}
 	closedir(iscsi_dir);
@@ -488,6 +518,8 @@ static void configfs_tpg_handle(const st
 
 	if ((event->mask & IN_CREATE) && !tpg) {
 		tpg = configfs_tpg_init(tgt, tpg_tag);
+		if (!tpg)
+			return;
 		configfs_tpg_update(tgt, tpg);
 	} else if ((event->mask & IN_DELETE) && tpg) {
 		list_del(&tpg->node);

Places

File Replace-snprintf-with-asprintf-for-string-handling.patch of Package target-isns (Revision 39aa87514453780d8493711186a5dc71)

Places