From: Donghwa Jeong <dh48.jeong@samsung.com>
Date: Thu, 31 May 2018 08:58:08 +0000 (+0900)
Subject: start: fix waitpid() blocking issue
X-Git-Tag: lxc-2.0.10~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bc415b658dee92d4d981943ce185d25c4646f90;p=thirdparty%2Flxc.git

start: fix waitpid() blocking issue

Signed-off-by: Donghwa Jeong <dh48.jeong@samsung.com>
---

diff --git a/src/lxc/start.c b/src/lxc/start.c
index be4b1762c..962b7a1fc 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1824,8 +1824,14 @@ int __lxc_start(const char *name, struct lxc_handler *handler,
 		goto out_abort;
 	}
 
-	while (waitpid(handler->pid, &status, 0) < 0 && errno == EINTR)
-		continue;
+	if (!handler->init_died && handler->pid > 0) {
+		ERROR("Child process is not killed");
+		goto out_abort;
+	}
+
+	status = lxc_wait_for_pid_status(handler->pid);
+	if (status < 0)
+		SYSERROR("Failed to retrieve status for %d", handler->pid);
 
 	/* If the child process exited but was not signaled, it didn't call
 	 * reboot. This should mean it was an lxc-execute which simply exited.