X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=4d8851ef813168a8445ad77ef12c1fdc838101d9;hb=0c687325f18ccb6950cd6a8a9665f33a6890d5a1;hp=6880973a10a08a08d2ec6475021aef8e7f3cf760;hpb=032b44f037bc3aeeb21a2e1679fa88eba2e3b551;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 6880973a1..4d8851ef8 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -3303,9 +3303,13 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		break;
 	default:
 		DBG("Getting session %s by name", cmd_ctx->lsm->session.name);
+		/*
+		 * We keep the session list lock across _all_ commands
+		 * for now, because the per-session lock does not
+		 * handle teardown properly.
+		 */
 		session_lock_list();
 		cmd_ctx->session = session_find_by_name(cmd_ctx->lsm->session.name);
-		session_unlock_list();
 		if (cmd_ctx->session == NULL) {
 			if (cmd_ctx->lsm->session.name != NULL) {
 				ret = LTTCOMM_SESS_NOT_FOUND;
@@ -3535,6 +3539,11 @@ skip_domain:
 	{
 		ret = cmd_destroy_session(cmd_ctx->session,
 				cmd_ctx->lsm->session.name);
+		/*
+		 * Set session to NULL so we do not unlock it after
+		 * free.
+		 */
+		cmd_ctx->session = NULL;
 		break;
 	}
 	case LTTNG_LIST_DOMAINS:
@@ -3669,6 +3678,9 @@ setup_error:
 	if (cmd_ctx->session) {
 		session_unlock(cmd_ctx->session);
 	}
+	if (need_tracing_session) {
+		session_unlock_list();
+	}
 init_setup_error:
 	return ret;
 }