mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-01 18:49:29 +00:00
Code Issues Releases Wiki Activity

utils: duplicate stderr as well in lxc_popen()

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner
2017-09-13 05:25:22 +02:00
parent b68c6a71d4
commit 3f32320757
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/lxc/utils.c
View File

@@ -472,6 +472,7 @@ const char** lxc_va_arg_list_to_argv_const(va_list ap, size_t skip)
extern struct lxc_popen_FILE *lxc_popen(const char *command) extern struct lxc_popen_FILE *lxc_popen(const char *command)
{ {
int ret;
struct lxc_popen_FILE *fp = NULL; struct lxc_popen_FILE *fp = NULL;
int parent_end = -1, child_end = -1; int parent_end = -1, child_end = -1;
int pipe_fds[2]; int pipe_fds[2];
@@ -491,24 +492,40 @@ extern struct lxc_popen_FILE *lxc_popen(const char *command)
if (child_pid == 0) { if (child_pid == 0) {
/* child */ /* child */
int child_std_end = STDOUT_FILENO;
close(parent_end); close(parent_end);
if (child_end != child_std_end) { if (child_end != STDOUT_FILENO) {
/* dup2() doesn't dup close-on-exec flag */ /* dup2() doesn't dup close-on-exec flag */
dup2(child_end, child_std_end); ret = dup2(child_end, STDOUT_FILENO);
if (ret < 0)
/* it's safe not to close child_end here WARN("Failed to duplicate stdout fd");
* as it's marked close-on-exec anyway
*/
} else { } else {
/* /*
* The descriptor is already the one we will use. * The descriptor is already the one we will use.
* But it must not be marked close-on-exec. * But it must not be marked close-on-exec.
* Undo the effects. * Undo the effects.
*/ */
if (fcntl(child_end, F_SETFD, 0) != 0) { ret = fcntl(child_end, F_SETFD, 0);
if (ret < 0) {
SYSERROR("Failed to remove FD_CLOEXEC from fd.");
exit(127);
}
}
if (child_end != STDERR_FILENO) {
/* dup2() doesn't dup close-on-exec flag */
ret = dup2(child_end, STDERR_FILENO);
if (ret < 0)
WARN("Failed to duplicate stdout fd");
} else {
/*
* The descriptor is already the one we will use.
* But it must not be marked close-on-exec.
* Undo the effects.
*/
ret = fcntl(child_end, F_SETFD, 0);
if (ret < 0) {
SYSERROR("Failed to remove FD_CLOEXEC from fd."); SYSERROR("Failed to remove FD_CLOEXEC from fd.");
exit(127); exit(127);
} }