{
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);
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;
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) {
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];