X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fust-consumer.c;h=8a2ba728d76dc0b8a6e34c66a90819bc6a12e7f4;hp=ca008d4adf65d0165d3eaca6f06f149361081594;hb=330be774319277f86ecf9445603bf97dc3249ca3;hpb=d41f73b7cb50d57974bd1fad22342abaf9718566

diff --git a/lttng-sessiond/ust-consumer.c b/lttng-sessiond/ust-consumer.c
index ca008d4ad..8a2ba728d 100644
--- a/lttng-sessiond/ust-consumer.c
+++ b/lttng-sessiond/ust-consumer.c
@@ -38,7 +38,7 @@ static int send_channel_streams(int sock,
 {
 	int ret, fd;
 	struct lttcomm_consumer_msg lum;
-	struct ltt_ust_stream *stream;
+	struct ltt_ust_stream *stream, *tmp;
 
 	DBG("Sending streams of channel %s to UST consumer", uchan->name);
 
@@ -46,8 +46,11 @@ static int send_channel_streams(int sock,
 	lum.cmd_type = LTTNG_CONSUMER_ADD_CHANNEL;
 
 	/*
-	 * We need to keep shm_fd open to make sure this key stays unique within
-	 * the session daemon.
+	 * We need to keep shm_fd open while we transfer the stream file
+	 * descriptors to make sure this key stays unique within the
+	 * session daemon. We can free the channel shm_fd without
+	 * problem after we finished sending stream fds for that
+	 * channel.
 	 */
 	lum.u.channel.channel_key = uchan->obj->shm_fd;
 	lum.u.channel.max_sb_size = uchan->attr.subbuf_size;
@@ -65,7 +68,7 @@ static int send_channel_streams(int sock,
 		goto error;
 	}
 
-	cds_list_for_each_entry(stream, &uchan->streams.head, list) {
+	cds_list_for_each_entry_safe(stream, tmp, &uchan->streams.head, list) {
 		int fds[2];
 
 		if (!stream->obj->shm_fd) {
@@ -121,6 +124,11 @@ int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
 
 	DBG("Sending metadata stream fd");
 
+	if (consumer_fd < 0) {
+		ERR("Consumer has negative file descriptor");
+		return -EINVAL;
+	}
+
 	if (usess->metadata->obj->shm_fd != 0) {
 		int fd;
 		int fds[2];