From f8f66d38569fb800905759a1f706bc39e2d35669 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Thu, 24 Sep 2015 14:20:42 -0400
Subject: [PATCH] Fix: Handle EINTR of waipid in run-as worker
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 src/common/runas.c | 46 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/common/runas.c b/src/common/runas.c
index 3a1de0a3a..08979fb79 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -527,6 +527,22 @@ int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid)
 	return run_as(RUN_AS_RMDIR_RECURSIVE, &data, uid, gid);
 }
 
+static
+void reset_sighandler(void)
+{
+	int sig;
+
+	for (sig = SIGHUP; sig <= SIGUNUSED; sig++) {
+		/* Skip unblockable signals. */
+		if (sig == SIGKILL || sig == SIGSTOP) {
+			continue;
+		}
+		if (signal(sig, SIG_DFL) == SIG_ERR) {
+			PERROR("reset signal %d", sig);
+		}
+	}
+}
+
 LTTNG_HIDDEN
 int run_as_create_worker(char *procname)
 {
@@ -566,6 +582,8 @@ int run_as_create_worker(char *procname)
 	} else if (pid == 0) {
 		/* Child */
 
+		reset_sighandler();
+
 		/* The child has no use for this lock. */
 		pthread_mutex_unlock(&worker_lock);
 		/* Just close, no shutdown. */
@@ -628,8 +646,6 @@ LTTNG_HIDDEN
 void run_as_destroy_worker(void)
 {
 	struct run_as_worker *worker = global_worker;
-	int status;
-	pid_t pid;
 
 	pthread_mutex_lock(&worker_lock);
 	if (!worker) {
@@ -641,9 +657,29 @@ void run_as_destroy_worker(void)
 	}
 	worker->sockpair[0] = -1;
 	/* Wait for worker. */
-	pid = waitpid(worker->pid, &status, 0);
-	if (pid < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-		PERROR("wait");
+	for (;;) {
+		int status;
+		pid_t wait_ret;
+
+		wait_ret = waitpid(worker->pid, &status, 0);
+		if (wait_ret < 0) {
+			if (errno == EINTR) {
+				continue;
+			}
+			PERROR("waitpid");
+			break;
+		}
+
+		if (WIFEXITED(status)) {
+			LOG(WEXITSTATUS(status) == 0 ? PRINT_DBG : PRINT_ERR,
+					DEFAULT_RUN_AS_WORKER_NAME " terminated with status code %d",
+				        WEXITSTATUS(status));
+			break;
+		} else if (WIFSIGNALED(status)) {
+			ERR(DEFAULT_RUN_AS_WORKER_NAME " was killed by signal %d",
+					WTERMSIG(status));
+			break;
+		}
 	}
 	free(worker);
 	global_worker = NULL;
-- 
2.34.1