[PATCH iproute2 0/2] Add missing file close

[PATCH iproute2 0/2] Add missing file close

[Zhang Shengju]

This patch set adds some missing close() calls.

Zhang Shengju (2):
  libs: close file in netns_switch()
  netns: add missing file close

 ip/ipnetns.c    | 5 +++++
 lib/namespace.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

-- 
1.8.3.1

[PATCH iproute2 1/2] libs: close file in netns_switch()

[Zhang Shengju]

Add mising close() calls.

Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
---
 lib/namespace.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/namespace.c b/lib/namespace.c
index 8197165..025ed47 100644
--- a/lib/namespace.c
+++ b/lib/namespace.c
@@ -45,7 +45,7 @@ static void bind_etc(const char *name)
 int netns_switch(char *name)
 {
 	char net_path[PATH_MAX];
-	int netns;
+	int netns, ret = -1;
 
 	snprintf(net_path, sizeof(net_path), "%s/%s", NETNS_RUN_DIR, name);
 	netns = open(net_path, O_RDONLY | O_CLOEXEC);
@@ -83,10 +83,10 @@ int netns_switch(char *name)
 
 	/* Setup bind mounts for config files in /etc */
 	bind_etc(name);
-	return 0;
+	ret = 0;
 fail_close:
 	close(netns);
-	return -1;
+	return ret;
 }
 
 int netns_get_fd(const char *name)
-- 
1.8.3.1

[PATCH iproute2 2/2] netns: add missing file close

[Zhang Shengju]

Add missing file close.

Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
---
 ip/ipnetns.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ip/ipnetns.c b/ip/ipnetns.c
index 088096f..d1af0c6 100644
--- a/ip/ipnetns.c
+++ b/ip/ipnetns.c
@@ -462,8 +462,10 @@ static int netns_pids(int argc, char **argv)
 	if (fstat(netns, &netst) < 0) {
 		fprintf(stderr, "Stat of netns failed: %s\n",
 			strerror(errno));
+		close(netns);
 		return -1;
 	}
+	close(netns);
 	dir = opendir("/proc/");
 	if (!dir) {
 		fprintf(stderr, "Open of /proc failed: %s\n",
@@ -522,8 +524,10 @@ static int netns_identify(int argc, char **argv)
 	if (fstat(netns, &netst) < 0) {
 		fprintf(stderr, "Stat of netns failed: %s\n",
 			strerror(errno));
+		close(netns);
 		return -1;
 	}
+	close(netns);
 	dir = opendir(NETNS_RUN_DIR);
 	if (!dir) {
 		/* Succeed treat a missing directory as an empty directory */
@@ -728,6 +732,7 @@ static int netns_set(int argc, char **argv)
 			name, strerror(errno));
 		return -1;
 	}
+	close(netns);
 
 	return set_netnsid_from_name(name, nsid);
 }
-- 
1.8.3.1

Re: [PATCH iproute2 1/2] libs: close file in netns_switch()

[Stephen Hemminger]

On Fri, 14 Aug 2015 02:56:52 +0000
Zhang Shengju <zhangshengju@cmss.chinamobile.com> wrote:

> Add mising close() calls.
> 
> Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>

Patch does not apply cleanly to current git code.