From: Mathieu Desnoyers Date: Mon, 28 Jul 2014 00:38:50 +0000 (-0400) Subject: Fix: unbalanced ustconsumer32_data.pid_mutex lock X-Git-Tag: v2.6.0-rc1~97 X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=385b881bb1ff2ddc5ff2657e038a0c54712e19a4;ds=sidebyside Fix: unbalanced ustconsumer32_data.pid_mutex lock It is never locked in this function, but should be. This is triggering spurious runtime failures on my system, where it seems that sessiond was sometimes breaking the communication pipe with liblttng-ctl when the unbalanced unlock is reached. This should be backported to stable-2.4 and stable-2.5. Signed-off-by: Mathieu Desnoyers Signed-off-by: David Goulet --- diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c index a8751c696..1ee6f4a9f 100644 --- a/src/bin/lttng-sessiond/main.c +++ b/src/bin/lttng-sessiond/main.c @@ -3016,6 +3016,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock, } /* 32-bit */ + pthread_mutex_lock(&ustconsumer32_data.pid_mutex); if (consumerd32_bin[0] != '\0' && ustconsumer32_data.pid == 0 && cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {