From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 9 Dec 2017 18:00:37 +0000 (+0100)
Subject: coverity: #1425879
X-Git-Tag: lxc-3.0.0.beta1~113^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc9724f76c07c7bbaf8881d32969b9585671013e;p=thirdparty%2Flxc.git

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 c8775de6c..7a7678d18 100644
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -588,15 +588,22 @@ 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;
+
 	if (console->buffer_log_file_fd >= 0)
 		close(console->buffer_log_file_fd);
 	console->buffer_log_file_fd = -1;
diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
index 47a4f0c27..ccd1787df 100644
--- 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) {