proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-30 10:03:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2149 from tych0/fix-userns-error-handling

Browse Source 
fix userns helper error handling
This commit is contained in:
Christian Brauner 2018-02-09 14:49:11 +01:00 committed by GitHub
commit 056fec39f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/conf.c
View File

@ -4003,14 +4003,14 @@ int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data,
} }
on_error: on_error:
/* Wait for child to finish. */
if (pid > 0)
status = wait_for_pid(pid);
if (p[0] != -1) if (p[0] != -1)
close(p[0]); close(p[0]);
close(p[1]); close(p[1]);
/* Wait for child to finish. */
if (pid > 0)
status = wait_for_pid(pid);
if (status < 0) if (status < 0)
ret = -1; ret = -1;
@ -4178,6 +4178,10 @@ int userns_exec_full(struct lxc_conf *conf, int (*fn)(void *), void *data,
} }
on_error: on_error:
if (p[0] != -1)
close(p[0]);
close(p[1]);
/* Wait for child to finish. */ /* Wait for child to finish. */
if (pid > 0) if (pid > 0)
ret = wait_for_pid(pid); ret = wait_for_pid(pid);
@ -4189,10 +4193,6 @@ on_error:
if (host_gid_map && (host_gid_map != container_root_gid)) if (host_gid_map && (host_gid_map != container_root_gid))
free(host_gid_map); free(host_gid_map);
if (p[0] != -1)
close(p[0]);
close(p[1]);
return ret; return ret;
} }