proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-11 19:42:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/namespace: don't leak fd in error case

Browse Source 
Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2015-08-06 14:24:35 +02:00 committed by Stephen Hemminger
parent b95d28c380
commit 5950ba914e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/namespace.c
View File

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