Commit 46cfc3ad authored by Rusty Russell's avatar Rusty Russell

pipecmd: close fds in child.

This is usually what you want; I didn't even add a flag to stop it.
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent b98c6847
...@@ -137,6 +137,13 @@ pid_t pipecmdarr(int *fd_tochild, int *fd_fromchild, int *fd_errfromchild, ...@@ -137,6 +137,13 @@ pid_t pipecmdarr(int *fd_tochild, int *fd_fromchild, int *fd_errfromchild,
goto child_errno_fail; goto child_errno_fail;
close(errfromchild[1]); close(errfromchild[1]);
} }
/* Make (fairly!) sure all other fds are closed. */
int max = sysconf(_SC_OPEN_MAX);
for (int i = 3; i < max; i++)
if (i != execfail[1])
close(i);
execvp(arr[0], arr); execvp(arr[0], arr);
child_errno_fail: child_errno_fail:
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
* If @errfd == @outfd (and non-NULL) they will be shared. * If @errfd == @outfd (and non-NULL) they will be shared.
* If @infd, @outfd or @errfd is &pipecmd_preserve, it is unchanged. * If @infd, @outfd or @errfd is &pipecmd_preserve, it is unchanged.
* *
* The return value is the pid of the child, or -1. * The return value is the pid of the child, or -1. All other file-descriptors
* are closed in the child.
*/ */
pid_t pipecmd(int *infd, int *outfd, int *errfd, const char *cmd, ...); pid_t pipecmd(int *infd, int *outfd, int *errfd, const char *cmd, ...);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment