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-3.1.0~279^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=321db0260f6f;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 8c8a7c3aa..05cecb58e 100755
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1901,6 +1901,11 @@ int __lxc_start(const char *name, struct lxc_handler *handler,
 		goto out_abort;
 	}
 
+	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);