From: Tycho Andersen <tycho@tycho.ws>
Date: Fri, 19 Jan 2018 03:21:10 +0000 (+0000)
Subject: lxc.init: correctly exit with the app's error code
X-Git-Tag: lxc-2.0.10~402
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f5d4e2e51e69f8b9b4dd55a58643a315337d0a7;p=thirdparty%2Flxc.git

lxc.init: correctly exit with the app's error code

Based on the comments in the code (and the have_status flag), the intent
here (and IMO, the desired behavior) should be for init.lxc to propagate
the actual exit code from the real application process up through.
Otherwise, it is swallowed and nobody can access it.

The bug being fixed here is that ret held the correct exit code, but when
it went around the loop again (to wait for other children) ret is
clobbered. Let's save the desired exit status somewhere else, so it can't
get clobbered, and we propagate things correctly.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
---

diff --git a/src/lxc/lxc_init.c b/src/lxc/lxc_init.c
index 60667036a..c71c4d471 100644
--- a/src/lxc/lxc_init.c
+++ b/src/lxc/lxc_init.c
@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
 	struct sigaction act;
 	struct lxc_log log;
 	sigset_t mask, omask;
-	int have_status = 0, shutdown = 0;
+	int have_status = 0, exit_with = 1, shutdown = 0;
 
 	if (arguments_parse(&my_args, argc, argv))
 		exit(EXIT_FAILURE);
@@ -412,14 +412,14 @@ int main(int argc, char *argv[])
 		 * pid) and continue to wait for the end of the orphan group.
 		 */
 		if (waited_pid == pid && !have_status) {
-			ret = lxc_error_set_and_log(waited_pid, status);
+			exit_with = lxc_error_set_and_log(waited_pid, status);
 			have_status = 1;
 		}
 	}
 out:
 	if (ret < 0)
 		exit(EXIT_FAILURE);
-	exit(ret);
+	exit(exit_with);
 }
 
 static void print_usage(const struct option longopts[])