procd: Do not leak pipe file descriptors to children

Without this change, a process started by procd can have access to
stdout/err of processes started by procd before.

Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>

diff --git a/rcS.c b/rcS.c
index 4ecf0c10d7da1392c905717c2f15906ea6f5fe6e..b1202bf96613d19ee076ee700ad234e6cfcc9db6 100644 (file)
--- a/rcS.c
+++ b/rcS.c
@@ -82,6 +82,7 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 
        if (pid) {
                close(pipefd[1]);
+               fcntl(pipefd[0], F_SETFD, FD_CLOEXEC);
                s->fd.stream.string_data = true,
                s->fd.stream.notify_read = pipe_cb,
                runqueue_process_add(q, &s->proc, pid);

diff --git a/service/instance.c b/service/instance.c
index e5c483010340d0a62206604f7551bf44469498e4..bb766ea99f9a19b5226a2d596faa2f98a8c5c192 100644 (file)
--- a/service/instance.c
+++ b/service/instance.c
@@ -444,11 +444,13 @@ instance_start(struct service_instance *in)
        if (opipe[0] > -1) {
                ustream_fd_init(&in->_stdout, opipe[0]);
                closefd(opipe[1]);
+               fcntl(opipe[0], F_SETFD, FD_CLOEXEC);
        }
 
        if (epipe[0] > -1) {
                ustream_fd_init(&in->_stderr, epipe[0]);
                closefd(epipe[1]);
+               fcntl(epipe[0], F_SETFD, FD_CLOEXEC);
        }
 
        service_event("instance.start", in->srv->name, in->name);