From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 26 Nov 2019 20:41:26 +0000 (-0500)
Subject: relayd: Don't bypass the fd tracker when closing file descriptors
X-Git-Tag: v2.12.0-rc1~64
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d43da0fe92772f5733e856d8c101fe689ae26698;p=lttng-tools.git

relayd: Don't bypass the fd tracker when closing file descriptors

There is no reason to close all file descriptors at this point in the
relay daemon as we know for a fact that the only open fds are stdout
and stderr. If the relayd was to depend on a library that opens other
file descriptors, it would be unadvisable to perform this kind of bulk
closing of all possible file descriptors.

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

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index f1f03d1bd..ed424d9dd 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -4042,23 +4042,12 @@ int main(int argc, char **argv)
 
 	/* Daemonize */
 	if (opt_daemon || opt_background) {
-		int i;
-
 		ret = lttng_daemonize(&child_ppid, &recv_child_signal,
 			!opt_background);
 		if (ret < 0) {
 			retval = -1;
 			goto exit_options;
 		}
-
-		/*
-		 * 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);
-		}
 	}
 
 	if (opt_working_directory) {