emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nsenter,unshare: share common code; fix a bug of not closing all fds

Browse Source 
function                                             old     new   delta
xvfork_parent_waits_and_exits                          -      64     +64
exec_prog_or_SHELL                                     -      39     +39
unshare_main                                         873     810     -63
nsenter_main                                         663     596     -67
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 0/2 up/down: 106/-130)          Total: -27 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2016-04-02 18:06:24 +02:00
parent c87e81f944
commit 8220399173
5 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
util-linux/unshare.c
View File

@ -281,7 +281,7 @@ int unshare_main(int argc UNUSED_PARAM, char **argv)
if (fdp.wr >= 0) {
close(fdp.wr); /* Release child */
/*close(fdp.rd);*/
close(fdp.rd); /* should close fd, to not confuse exec'ed PROG */
}
if (need_mount) {
@ -307,14 +307,7 @@ int unshare_main(int argc UNUSED_PARAM, char **argv)
* that'll become PID 1 in this new namespace.
*/
if (opts & OPT_fork) {
pid_t pid = xfork();
if (pid > 0) {
/* Parent */
int exit_status = wait_for_exitstatus(pid);
if (WIFSIGNALED(exit_status))
kill_myself_with_sig(WTERMSIG(exit_status));
return WEXITSTATUS(exit_status);
}
xvfork_parent_waits_and_exits();
/* Child continues */
}
@ -354,11 +347,5 @@ int unshare_main(int argc UNUSED_PARAM, char **argv)
mount_or_die("proc", proc_mnt_target, "proc", MS_NOSUID | MS_NOEXEC | MS_NODEV);
}
if (argv[0]) {
BB_EXECVP_or_die(argv);
}
/* unshare from util-linux 2.27.1, despite not documenting it,
* runs a login shell (argv0="-sh") if no PROG is given
*/
run_shell(getenv("SHELL"), /*login:*/ 1, NULL, NULL);
exec_prog_or_SHELL(argv);
}