* Send all stream fds of UST channel to the consumer.
*/
static int send_channel_streams(int sock,
- struct ust_app_channel *uchan)
+ struct ust_app_channel *uchan,
+ uid_t uid, gid_t gid)
{
int ret, fd;
struct lttcomm_consumer_msg lum;
*/
lum.u.stream.output = DEFAULT_UST_CHANNEL_OUTPUT;
lum.u.stream.mmap_len = stream->obj->memory_map_size;
+ lum.u.stream.uid = uid;
+ lum.u.stream.gid = gid;
strncpy(lum.u.stream.path_name, stream->pathname, PATH_MAX - 1);
lum.u.stream.path_name[PATH_MAX - 1] = '\0';
DBG("Sending stream %d to consumer", lum.u.stream.stream_key);
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");
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];
lum.u.stream.state = LTTNG_CONSUMER_ACTIVE_STREAM;
lum.u.stream.output = DEFAULT_UST_CHANNEL_OUTPUT;
lum.u.stream.mmap_len = usess->metadata->stream_obj->memory_map_size;
+ lum.u.stream.uid = usess->uid;
+ lum.u.stream.gid = usess->gid;
strncpy(lum.u.stream.path_name, usess->metadata->pathname, PATH_MAX - 1);
lum.u.stream.path_name[PATH_MAX - 1] = '\0';
DBG("Sending metadata stream %d to consumer", lum.u.stream.stream_key);
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 */
while ((node = hashtable_iter_get_node(&iter)) != NULL) {
uchan = caa_container_of(node, struct ust_app_channel, node);
- ret = send_channel_streams(sock, uchan);
+ ret = send_channel_streams(sock, uchan, usess->uid,
+ usess->gid);
if (ret < 0) {
rcu_read_unlock();
goto error;