From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Mon, 5 Feb 2018 22:58:19 +0000 (-0500)
Subject: Use ust_lock during sock_info operations for atomicity against fork
X-Git-Tag: v2.9.3~10
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=005aeac5da3c85a5f57f570e3279ab7436ac81e6;p=lttng-ust.git

Use ust_lock during sock_info operations for atomicity against fork

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index e92bb870..6c11288c 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -1382,6 +1382,10 @@ restart:
 		prev_connect_failed = 0;
 	}
 
+	if (ust_lock()) {
+		goto quit;
+	}
+
 	if (sock_info->socket != -1) {
 		/* FD tracker is updated by ustcomm_close_unix_sock() */
 		ret = ustcomm_close_unix_sock(sock_info->socket);
@@ -1401,9 +1405,6 @@ restart:
 		sock_info->notify_socket = -1;
 	}
 
-	if (ust_lock()) {
-		goto quit;
-	}
 
 	/*
 	 * Register. We need to perform both connect and sending