From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 9 Jul 2018 12:28:57 +0000 (+0200)
Subject: start: don't unconditionally open("/dev/null")
X-Git-Tag: lxc-2.0.10~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=535ceb0b2629bb14583cca0bfd22e6acb6c3a01d;p=thirdparty%2Flxc.git

start: don't unconditionally open("/dev/null")

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

diff --git a/src/lxc/start.c b/src/lxc/start.c
index a12e2ecfd..209904c01 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1287,23 +1287,18 @@ static int do_start(void *data)
 
 	close(handler->sigfd);
 
-	if (devnull_fd < 0) {
-		devnull_fd = open_devnull();
-
-		if (devnull_fd < 0)
-			goto out_warn_father;
-	}
+	if (handler->conf->console.slave < 0 && handler->backgrounded) {
+		if (devnull_fd < 0) {
+			devnull_fd = open_devnull();
+			if (devnull_fd < 0)
+				goto out_warn_father;
+		}
 
-	if (handler->conf->console.slave < 0 && handler->backgrounded)
-		if (set_stdfds(devnull_fd) < 0) {
-			ERROR("Failed to redirect std{in,out,err} to "
-			      "\"/dev/null\"");
+		ret = set_stdfds(devnull_fd);
+		if (ret < 0) {
+			ERROR("Failed to redirect std{in,out,err} to \"/dev/null\"");
 			goto out_warn_father;
 		}
-
-	if (devnull_fd >= 0) {
-		close(devnull_fd);
-		devnull_fd = -1;
 	}
 
 	setsid();