X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=5cfd57971f7423fe21f69c1d58b2cfafca99a05b;hp=e8bd45f15ae7ee7ebda9239fd88cb7f0ea2b6ced;hb=ceed52b545103258e84f1c7040700be9dbbbaec6;hpb=f37d259d342af1ff8855d9eaa578cb7a3cfcc4f2

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index e8bd45f15..5cfd57971 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -4547,11 +4547,6 @@ int main(int argc, char **argv)
 
 	rcu_register_thread();
 
-	/* Create thread quit pipe */
-	if ((ret = init_thread_quit_pipe()) < 0) {
-		goto error;
-	}
-
 	setup_consumerd_path();
 
 	/* Parse arguments */
@@ -4562,11 +4557,31 @@ int main(int argc, char **argv)
 
 	/* Daemonize */
 	if (opt_daemon) {
+		int i;
+
+		/*
+		 * fork
+		 * child: setsid, close FD 0, 1, 2, chdir /
+		 * parent: exit (if fork is successful)
+		 */
 		ret = daemon(0, 0);
 		if (ret < 0) {
 			PERROR("daemon");
 			goto error;
 		}
+		/*
+		 * We are in the child. Make sure all other file
+		 * descriptors are closed, in case we are called with
+		 * more opened file descriptors than the standard ones.
+		 */
+		for (i = 3; i < sysconf(_SC_OPEN_MAX); i++) {
+			(void) close(i);
+		}
+	}
+
+	/* Create thread quit pipe */
+	if ((ret = init_thread_quit_pipe()) < 0) {
+		goto error;
 	}
 
 	/* Check if daemon is UID = 0 */