From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 10 Jul 2013 19:39:54 +0000 (-0400)
Subject: Fix: consumer err_sock cloexec
X-Git-Tag: v2.3.0-rc1~52
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a24f05ab8afe43b1122d1fd6a4f4346443e0084a;p=lttng-tools.git

Fix: consumer err_sock cloexec

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 91e085290..048c1e16d 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -4145,6 +4145,16 @@ static int set_consumer_sockets(struct consumer_data *consumer_data,
 		goto error;
 	}
 
+	/*
+	 * Set the CLOEXEC flag. Return code is useless because either way, the
+	 * show must go on.
+	 */
+	ret = utils_set_fd_cloexec(consumer_data->err_sock);
+	if (ret < 0) {
+		PERROR("utils_set_fd_cloexec");
+		/* continue anyway */
+	}
+
 	/* File permission MUST be 660 */
 	ret = chmod(consumer_data->err_unix_sock_path,
 			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);