X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=2983cbf8c1da67dbed1c2092db68b3631532cb24;hb=4e4714cb244d7ace4f4a462a3923066fd4760669;hp=b5cfe307df0f09e1a1eec61de85795bee1de29ea;hpb=fb45065e7ccafc636e6eec7ab2a463c49e603ebb;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index b5cfe307d..2983cbf8c 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -586,6 +586,34 @@ static int generate_lock_file_path(char *path, size_t len)
 	return ret;
 }
 
+/*
+ * Wait on consumer process termination.
+ *
+ * Need to be called with the consumer data lock held or from a context
+ * ensuring no concurrent access to data (e.g: cleanup).
+ */
+static void wait_consumer(struct consumer_data *consumer_data)
+{
+	pid_t ret;
+	int status;
+
+	if (consumer_data->pid <= 0) {
+		return;
+	}
+
+	DBG("Waiting for complete teardown of consumerd (PID: %d)",
+			consumer_data->pid);
+	ret = waitpid(consumer_data->pid, &status, 0);
+	if (ret == -1) {
+		PERROR("consumerd waitpid pid: %d", consumer_data->pid)
+	}
+	if (!WIFEXITED(status)) {
+		ERR("consumerd termination with error: %d",
+				WEXITSTATUS(ret));
+	}
+	consumer_data->pid = 0;
+}
+
 /*
  * Cleanup the session daemon's data structures.
  */
@@ -680,6 +708,11 @@ static void sessiond_cleanup(void)
 		}
 	}
 
+	wait_consumer(&kconsumer_data);
+	wait_consumer(&ustconsumer64_data);
+	wait_consumer(&ustconsumer32_data);
+
+
 	DBG("Cleaning up all agent apps");
 	agent_app_ht_clean();
 
@@ -1500,7 +1533,6 @@ error:
 
 	unlink(consumer_data->err_unix_sock_path);
 	unlink(consumer_data->cmd_unix_sock_path);
-	consumer_data->pid = 0;
 	pthread_mutex_unlock(&consumer_data->lock);
 
 	/* Cleanup metadata socket mutex. */
@@ -1787,6 +1819,12 @@ static void sanitize_wait_queue(struct ust_reg_wait_queue *wait_queue)
 				wait_queue->count--;
 				ust_app_destroy(wait_node->app);
 				free(wait_node);
+				/*
+				 * Silence warning of use-after-free in
+				 * cds_list_for_each_entry_safe which uses
+				 * __typeof__(*wait_node).
+				 */
+				wait_node = NULL;
 				break;
 			}
 		}