X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=24855b9767632bc1584316b0b0c80362d870c2e5;hp=c45280d11583f0d8f1f44b125546b24b7d5e3232;hb=929f71ec24b58045319473f050a7f235f726ec78;hpb=16ffecdb7f39efbac8b3866a976ac4e13ad09ff5

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index c45280d11..24855b976 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1336,6 +1336,26 @@ static void destroy_all_sessions_and_wait(void)
 	DBG("Destruction of all sessions completed");
 }
 
+static int run_as_worker_post_fork_cleanup(void *data)
+{
+	struct sessiond_config *sessiond_config = data;
+
+	sessiond_config_fini(sessiond_config);
+	return 0;
+}
+
+static int launch_run_as_worker(const char *procname)
+{
+	/*
+	 * Clean-up before forking the run-as worker. Any dynamically
+	 * allocated memory of which the worker is not aware will
+	 * be leaked as the process forks a run-as worker (and performs
+	 * no exec*()). The same would apply to any opened fd.
+	 */
+	return run_as_create_worker(procname, run_as_worker_post_fork_cleanup,
+			&config);
+}
+
 /*
  * main
  */
@@ -1469,7 +1489,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (run_as_create_worker(argv[0]) < 0) {
+	if (launch_run_as_worker(argv[0]) < 0) {
 		goto exit_create_run_as_worker_cleanup;
 	}