From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 12 Dec 2018 03:27:20 +0000 (-0500)
Subject: Fix: set client socket permissions after launch of client thread
X-Git-Tag: v2.12.0-rc1~689
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=308df7bb0aad1ee6273c99480445a2d4af81e47a;p=lttng-tools.git

Fix: set client socket permissions after launch of client thread

The client thread is now the owner of the client socket.  As the
client socket is now created by the client thread, the socket's
permissions must be set after the launch of the client thread.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 7f66a7271..c45280d11 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1626,12 +1626,6 @@ int main(int argc, char **argv)
 		goto stop_threads;
 	}
 
-	/* Set credentials to socket */
-	if (is_root && set_permissions(config.rundir.value)) {
-		retval = -1;
-		goto stop_threads;
-	}
-
 	/* Get parent pid if -S, --sig-parent is specified. */
 	if (config.sig_parent) {
 		ppid = getppid();
@@ -1741,6 +1735,12 @@ int main(int argc, char **argv)
 		goto stop_threads;
 	}
 
+	/* Set credentials of the client socket and rundir */
+	if (is_root && set_permissions(config.rundir.value)) {
+		retval = -1;
+		goto stop_threads;
+	}
+
 	if (!launch_ust_dispatch_thread(&ust_cmd_queue, apps_cmd_pipe[1],
 			apps_cmd_notify_pipe[1])) {
 		retval = -1;