Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Inga Stotland <inga.stotland@intel.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     brian.gix@intel.com, Inga Stotland <inga.stotland@intel.com>
Subject: [PATCH BlueZ] mesh: Add closedir() of config directory after opendir()
Date:   Thu, 29 Aug 2019 13:22:45 -0700
Message-Id: <20190829202245.11308-1-inga.stotland@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

This adds missing closedir() call to accompany opendir() in
mesh_config_load_nodes().
Also, fixes confusing mix of variable names.
---
 mesh/mesh-config-json.c | 46 +++++++++++++++++++++++------------------
 mesh/mesh-config.h      |  4 ++--
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
index 036ec9017..cafa2fdd7 100644
--- a/mesh/mesh-config-json.c
+++ b/mesh/mesh-config-json.c
@@ -61,7 +61,7 @@ struct write_info {
 	mesh_config_status_func_t cb;
 };
 
-static const char *cfg_name = "/node.json";
+static const char *cfgnode_name = "/node.json";
 static const char *bak_ext = ".bak";
 static const char *tmp_ext = ".tmp";
 
@@ -1723,18 +1723,18 @@ static struct mesh_config *create_config(const char *cfg_path,
 	return cfg;
 }
 
-struct mesh_config *mesh_config_create(const char *cfg_dir,
+struct mesh_config *mesh_config_create(const char *cfgdir_name,
 		const uint8_t uuid[16], struct mesh_config_node *db_node)
 {
 	char uuid_buf[33];
 	char name_buf[PATH_MAX];
 	struct mesh_config *cfg;
-	size_t max_len = strlen(cfg_name) + strlen(bak_ext);
+	size_t max_len = strlen(cfgnode_name) + strlen(bak_ext);
 
 	if (!hex2str((uint8_t *) uuid, 16, uuid_buf, sizeof(uuid_buf)))
 		return NULL;
 
-	snprintf(name_buf, PATH_MAX, "%s/%s", cfg_dir, uuid_buf);
+	snprintf(name_buf, PATH_MAX, "%s/%s", cfgdir_name, uuid_buf);
 
 	if (strlen(name_buf) + max_len >= PATH_MAX)
 		return NULL;
@@ -1743,8 +1743,8 @@ struct mesh_config *mesh_config_create(const char *cfg_dir,
 	if (mkdir(name_buf, 0755) != 0)
 		return NULL;
 
-	snprintf(name_buf, PATH_MAX, "%s/%s%s", cfg_dir, uuid_buf,
-								cfg_name);
+	snprintf(name_buf, PATH_MAX, "%s/%s%s", cfgdir_name, uuid_buf,
+								cfgnode_name);
 	l_debug("New node config %s", name_buf);
 
 	cfg = create_config(name_buf, uuid, db_node);
@@ -2042,7 +2042,7 @@ bool mesh_config_write_seq_number(struct mesh_config *cfg, uint32_t seq,
 
 	if (!cache) {
 		if (!write_int(cfg->jnode, "sequenceNumber", seq))
-		    return false;
+			return false;
 
 		return mesh_config_save(cfg, true, NULL, NULL);
 	}
@@ -2238,23 +2238,24 @@ bool mesh_config_save(struct mesh_config *cfg, bool no_wait,
 	return true;
 }
 
-bool mesh_config_load_nodes(const char *cfg_dir, mesh_config_node_func_t cb,
-							void *user_data)
+bool mesh_config_load_nodes(const char *cfgdir_name, mesh_config_node_func_t cb,
+								void *user_data)
 {
-	DIR *dir;
+	DIR *cfgdir;
 	struct dirent *entry;
-	size_t path_len = strlen(cfg_dir) + strlen(cfg_name) + strlen(bak_ext);
+	size_t path_len = strlen(cfgdir_name) + strlen(cfgnode_name) +
+								strlen(bak_ext);
 
-	create_dir(cfg_dir);
-	dir = opendir(cfg_dir);
-	if (!dir) {
+	create_dir(cfgdir_name);
+	cfgdir = opendir(cfgdir_name);
+	if (!cfgdir) {
 		l_error("Failed to open mesh node storage directory: %s",
-								cfg_dir);
+								cfgdir_name);
 		return false;
 	}
 
-	while ((entry = readdir(dir)) != NULL) {
-		char *dir, *fname, *bak;
+	while ((entry = readdir(cfgdir)) != NULL) {
+		char *dirname, *fname, *bak;
 		uint8_t uuid[16];
 		size_t node_len;
 
@@ -2263,14 +2264,15 @@ bool mesh_config_load_nodes(const char *cfg_dir, mesh_config_node_func_t cb,
 
 		/* Check path length */
 		node_len = strlen(entry->d_name);
+
 		if (path_len + node_len + 1 >= PATH_MAX)
 			continue;
 
 		if (!str2hex(entry->d_name, node_len, uuid, sizeof(uuid)))
 			continue;
 
-		dir = l_strdup_printf("%s/%s", cfg_dir, entry->d_name);
-		fname = l_strdup_printf("%s%s", dir, cfg_name);
+		dirname = l_strdup_printf("%s/%s", cfgdir_name, entry->d_name);
+		fname = l_strdup_printf("%s%s", dirname, cfgnode_name);
 
 		if (!load_node(fname, uuid, cb, user_data)) {
 
@@ -2281,12 +2283,16 @@ bool mesh_config_load_nodes(const char *cfg_dir, mesh_config_node_func_t cb,
 				remove(fname);
 				rename(bak, fname);
 			}
+
 			l_free(bak);
 		}
+
 		l_free(fname);
-		l_free(dir);
+		l_free(dirname);
 	}
 
+	closedir(cfgdir);
+
 	return true;
 }
 
diff --git a/mesh/mesh-config.h b/mesh/mesh-config.h
index 4172e794b..cf1f8b299 100644
--- a/mesh/mesh-config.h
+++ b/mesh/mesh-config.h
@@ -110,13 +110,13 @@ typedef bool (*mesh_config_node_func_t)(struct mesh_config_node *node,
 							struct mesh_config *cfg,
 							void *user_data);
 
-bool mesh_config_load_nodes(const char *cfg_dir, mesh_config_node_func_t cb,
+bool mesh_config_load_nodes(const char *cfgdir_name, mesh_config_node_func_t cb,
 							void *user_data);
 void mesh_config_release(struct mesh_config *cfg);
 void mesh_config_destroy(struct mesh_config *cfg);
 bool mesh_config_save(struct mesh_config *cfg, bool no_wait,
 				mesh_config_status_func_t cb, void *user_data);
-struct mesh_config *mesh_config_create(const char *cfg_path,
+struct mesh_config *mesh_config_create(const char *cfgdir_name,
 						const uint8_t uuid[16],
 						struct mesh_config_node *node);
 
-- 
2.21.0