X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=3709092198e5a9d1fcf6781134ba7e645ce3e202;hb=a0c83db984f8c20897666eef226b43fce81d0e13;hp=5ca2e7bad68187f7b61b628a28ae0932658a3ccb;hpb=e43c41c57a0087c782ca0ec29d6613364605d31d;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 5ca2e7bad..370909219 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -102,6 +102,7 @@ static void notify_channel_pipe(struct lttng_consumer_local_data *ctx,
 
 	msg.action = action;
 	msg.chan = chan;
+	msg.key = key;
 	do {
 		ret = write(ctx->consumer_channel_pipe[1], &msg, sizeof(msg));
 	} while (ret < 0 && errno == EINTR);
@@ -1959,6 +1960,13 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 	}
 
 end:
+	/*
+	 * Nullify the stream reference so it is not used after deletion. The
+	 * consumer data lock MUST be acquired before being able to check for a
+	 * NULL pointer value.
+	 */
+	stream->chan->metadata_stream = NULL;
+
 	pthread_mutex_unlock(&stream->lock);
 	pthread_mutex_unlock(&consumer_data.lock);
 
@@ -2011,9 +2019,6 @@ static int add_metadata_stream(struct lttng_consumer_stream *stream,
 		uatomic_inc(&relayd->refcount);
 	}
 
-	/* Update channel refcount once added without error(s). */
-	uatomic_inc(&stream->chan->refcount);
-
 	/*
 	 * When nb_init_stream_left reaches 0, we don't need to trigger any action
 	 * in terms of destroying the associated channel, because the action that
@@ -2968,7 +2973,7 @@ end:
 		}
 	}
 	if (client_socket >= 0) {
-		ret = close(sock);
+		ret = close(client_socket);
 		if (ret < 0) {
 			PERROR("close client_socket sessiond poll");
 		}