From 101dace0dc164352c81cb347a7a0022aa84eabc6 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Mon, 5 Feb 2018 17:58:19 -0500 Subject: [PATCH] Use ust_lock during sock_info operations for atomicity against fork Signed-off-by: Jonathan Rajotte Signed-off-by: Mathieu Desnoyers --- liblttng-ust/lttng-ust-comm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c index 32ba3c1d..0cf5ecd9 100644 --- a/liblttng-ust/lttng-ust-comm.c +++ b/liblttng-ust/lttng-ust-comm.c @@ -1396,6 +1396,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); @@ -1415,9 +1419,6 @@ restart: sock_info->notify_socket = -1; } - if (ust_lock()) { - goto quit; - } /* * Register. We need to perform both connect and sending -- 2.34.1