X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=03c00a677ac4f53702dd79c68cc2759b897bdd4f;hb=8c0670510c21676df20f086268593738e91ee332;hp=89b946896fc2858844be1f63c77bbd55c9e7642a;hpb=fc6432477fe8a5d3c4494acccdbe94c5912420bb;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 89b946896..03c00a677 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -883,6 +883,12 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		case LTTNG_UST_CHAN_PER_CPU:
 			channel->type = CONSUMER_CHANNEL_TYPE_DATA;
 			attr.type = LTTNG_UST_CHAN_PER_CPU;
+			/*
+			 * Set refcount to 1 for owner. Below, we will
+			 * pass ownership to the
+			 * consumer_thread_channel_poll() thread.
+			 */
+			channel->refcount = 1;
 			break;
 		case LTTNG_UST_CHAN_METADATA:
 			channel->type = CONSUMER_CHANNEL_TYPE_METADATA;
@@ -1042,6 +1048,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		if (!channel) {
 			ERR("UST consumer push metadata %" PRIu64 " not found", key);
 			ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+			goto end_msg_sessiond;
 		}
 
 		/* Tell session daemon we are ready to receive the metadata. */