[PATCH 5/6] lib/namespace: don't leak fd in error case

[Phil Sutter]

Signed-off-by: Phil Sutter <p...@nwl.cc>
---
 lib/namespace.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/namespace.c b/lib/namespace.c
index a61feb6..8197165 100644
--- a/lib/namespace.c
+++ b/lib/namespace.c
@@ -58,32 +58,35 @@ int netns_switch(char *name)
        if (setns(netns, CLONE_NEWNET) < 0) {
                fprintf(stderr, "setting the network namespace \"%s\" failed: 
%s\n",
                        name, strerror(errno));
-               return -1;
+               goto fail_close;
        }
 
        if (unshare(CLONE_NEWNS) < 0) {
                fprintf(stderr, "unshare failed: %s\n", strerror(errno));
-               return -1;
+               goto fail_close;
        }
        /* Don't let any mounts propagate back to the parent */
        if (mount("", "/", "none", MS_SLAVE | MS_REC, NULL)) {
                fprintf(stderr, "\"mount --make-rslave /\" failed: %s\n",
                        strerror(errno));
-               return -1;
+               goto fail_close;
        }
        /* Mount a version of /sys that describes the network namespace */
        if (umount2("/sys", MNT_DETACH) < 0) {
                fprintf(stderr, "umount of /sys failed: %s\n", strerror(errno));
-               return -1;
+               goto fail_close;
        }
        if (mount(name, "/sys", "sysfs", 0, NULL) < 0) {
                fprintf(stderr, "mount of /sys failed: %s\n",strerror(errno));
-               return -1;
+               goto fail_close;
        }
 
        /* Setup bind mounts for config files in /etc */
        bind_etc(name);
        return 0;
+fail_close:
+       close(netns);
+       return -1;
 }
 
 int netns_get_fd(const char *name)
-- 
2.1.2

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html