terminal: set FD_CLOEXEC on pty file descriptors

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index 338d33cd4758a1e20a0760d149159cab3b5ac5ab..bc61d4e5f4437db5978d0dd34fbf2fec79b269e3 100644 (file)
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -584,6 +584,18 @@ static int lxc_terminal_peer_proxy_alloc(struct lxc_terminal *terminal,
                goto on_error;
        }
 
+       ret = fd_cloexec(terminal->proxy.master, true);
+       if (ret < 0) {
+               SYSERROR("Failed to set FD_CLOEXEC flag on proxy terminal master");
+               goto on_error;
+       }
+
+       ret = fd_cloexec(terminal->proxy.slave, true);
+       if (ret < 0) {
+               SYSERROR("Failed to set FD_CLOEXEC flag on proxy terminal slave");
+               goto on_error;
+       }
+
        ret = lxc_setup_tios(terminal->proxy.slave, &oldtermio);
        if (ret < 0)
                goto on_error;
@@ -881,13 +893,13 @@ int lxc_terminal_create(struct lxc_terminal *terminal)
                goto err;
        }
 
-       ret = fcntl(terminal->master, F_SETFD, FD_CLOEXEC);
+       ret = fd_cloexec(terminal->master, true);
        if (ret < 0) {
                SYSERROR("Failed to set FD_CLOEXEC flag on terminal master");
                goto err;
        }
 
-       ret = fcntl(terminal->slave, F_SETFD, FD_CLOEXEC);
+       ret = fd_cloexec(terminal->slave, true);
        if (ret < 0) {
                SYSERROR("Failed to set FD_CLOEXEC flag on terminal slave");
                goto err;