coverity: #1425879

do not double close file descriptor

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/console.c b/src/lxc/console.c
index 1beafa4923c680b97c8f194e9f12958f264db187..035f52f7ea9077ad1de953cc03344d79818613e5 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -546,14 +546,20 @@ void lxc_console_delete(struct lxc_console *console)
        free(console->tios);
        console->tios = NULL;
 
-       close(console->peer);
-       close(console->master);
-       close(console->slave);
-       if (console->log_fd >= 0)
-               close(console->log_fd);
+       if (console->peer >= 0)
+               close(console->peer);
        console->peer = -1;
+
+       if (console->master >= 0)
+               close(console->master);
        console->master = -1;
+
+       if (console->slave >= 0)
+               close(console->slave);
        console->slave = -1;
+
+       if (console->log_fd >= 0)
+               close(console->log_fd);
        console->log_fd = -1;
 }
 

diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
index 47a4f0c2772f2a5f2536c3568940b4c5f2148f8a..ccd1787dff350519f969e7ac0d1f82f088870c7f 100644 (file)
--- a/src/lxc/tools/lxc_attach.c
+++ b/src/lxc/tools/lxc_attach.c
@@ -348,6 +348,7 @@ static int get_pty_on_host(struct lxc_container *c, struct wrapargs *wrap, int *
        if (c->attach(c, get_pty_on_host_callback, wrap, wrap->options, pid) < 0)
                goto err1;
        close(conf->console.slave); /* Close slave side. */
+       conf->console.slave = -1;
 
        ret = lxc_mainloop_open(&descr);
        if (ret) {