X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng-sessiond%2Fust-consumer.c;h=8a2ba728d76dc0b8a6e34c66a90819bc6a12e7f4;hb=7753dea8e1af2342c4d42d2efc5da62538709ca8;hp=46558417ecc2c47b295a7613ae35c7da7c9412d0;hpb=7ad0a0cb283d4004cf9274df8eec4e3530864fc7;p=lttng-tools.git

diff --git a/lttng-sessiond/ust-consumer.c b/lttng-sessiond/ust-consumer.c
index 46558417e..8a2ba728d 100644
--- a/lttng-sessiond/ust-consumer.c
+++ b/lttng-sessiond/ust-consumer.c
@@ -100,18 +100,7 @@ static int send_channel_streams(int sock,
 			perror("send consumer stream ancillary data");
 			goto error;
 		}
-
-		/*
-		 * We release the stream object here, as we have passed
-		 * it to the consumer.
-		 */
-		/* Ensure we don't let the app know (sock = -1). */
-		ustctl_release_object(-1, stream->obj);
-		cds_list_del(&stream->list);
-		free(stream);
 	}
-	/* Ensure we don't let the app know (sock = -1). */
-	ustctl_release_object(-1, uchan->obj);
 
 	DBG("consumer channel streams sent");
 
@@ -135,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];
@@ -179,10 +173,6 @@ int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
 			perror("send consumer stream");
 			goto error;
 		}
-		/* Metadata fds passed to consumer, release them. */
-		/* Ensure we don't let the app know (sock = -1). */
-		ustctl_release_object(-1, usess->metadata->stream_obj);
-		ustctl_release_object(-1, usess->metadata->obj);
 	}
 
 	/* Send each channel fd streams of session */