X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt-sessiond%2Fkernel-ctl.c;h=16b85bdb5bcb5b6793450b0f2794023541fa2466;hb=19e708528b7ebd740485ca05056e56e6835d43a7;hp=db97dee205bc4f6f13b437b44b57644cf01704dd;hpb=f3ed775ef4842019b396f06095b053c3a70bc3c8;p=lttng-tools.git

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index db97dee20..16b85bdb5 100644
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -18,6 +18,7 @@
 
 #define _GNU_SOURCE
 #include <errno.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -54,6 +55,12 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
 	}
 
 	lks->fd = ret;
+	/* Prevent fd duplication after execlp() */
+	ret = fcntl(lks->fd, F_SETFD, FD_CLOEXEC);
+	if (ret < 0) {
+		perror("fcntl session fd");
+	}
+
 	lks->kconsumer_fds_sent = 0;
 	session->kernel_session = lks;
 	session->kern_session_count++;
@@ -92,6 +99,12 @@ int kernel_create_channel(struct ltt_kernel_session *session, struct lttng_chann
 
 	/* Setup the channel fd */
 	lkc->fd = ret;
+	/* Prevent fd duplication after execlp() */
+	ret = fcntl(lkc->fd, F_SETFD, FD_CLOEXEC);
+	if (ret < 0) {
+		perror("fcntl session fd");
+	}
+
 	/* Add channel to session */
 	cds_list_add(&lkc->list, &session->channel_list.head);
 	session->channel_count++;
@@ -111,7 +124,7 @@ error:
  *  Create a kernel event, enable it to the kernel tracer and add it to the
  *  channel event list of the kernel session.
  */
-int kernel_create_event(struct ltt_kernel_channel *channel, struct lttng_event *ev)
+int kernel_create_event(struct lttng_event *ev, struct ltt_kernel_channel *channel)
 {
 	int ret;
 	struct ltt_kernel_event *event;
@@ -123,14 +136,71 @@ int kernel_create_event(struct ltt_kernel_channel *channel, struct lttng_event *
 
 	ret = kernctl_create_event(channel->fd, event->event);
 	if (ret < 0) {
-		ERR("Unable to enable event %s for channel %s", ev->name, channel->channel->name);
-		goto error;
+		perror("create event ioctl");
+		goto free_event;
 	}
 
 	event->fd = ret;
+	event->enabled = 1;
+	/* Prevent fd duplication after execlp() */
+	ret = fcntl(event->fd, F_SETFD, FD_CLOEXEC);
+	if (ret < 0) {
+		perror("fcntl session fd");
+	}
+
 	/* Add event to event list */
 	cds_list_add(&event->list, &channel->events_list.head);
-	DBG("Event %s enabled (fd: %d)", ev->name, event->fd);
+	DBG("Event %s created (fd: %d)", ev->name, event->fd);
+
+	return 0;
+
+free_event:
+	free(event);
+error:
+	return -1;
+}
+
+/*
+ *  kernel_enable_event
+ *
+ *  Enable a kernel event.
+ */
+int kernel_enable_event(struct ltt_kernel_event *event)
+{
+	int ret;
+
+	ret = kernctl_enable(event->fd);
+	if (ret < 0) {
+		perror("enable event ioctl");
+		goto error;
+	}
+
+	event->enabled = 1;
+	DBG("Kernel event %s enabled (fd: %d)", event->event->name, event->fd);
+
+	return 0;
+
+error:
+	return -1;
+}
+
+/*
+ *  kernel_disable_event
+ *
+ *  Disable a kernel event.
+ */
+int kernel_disable_event(struct ltt_kernel_event *event)
+{
+	int ret;
+
+	ret = kernctl_disable(event->fd);
+	if (ret < 0) {
+		perror("disable event ioctl");
+		goto error;
+	}
+
+	event->enabled = 0;
+	DBG("Kernel event %s disabled (fd: %d)", event->event->name, event->fd);
 
 	return 0;
 
@@ -162,6 +232,12 @@ int kernel_open_metadata(struct ltt_kernel_session *session)
 	}
 
 	lkm->fd = ret;
+	/* Prevent fd duplication after execlp() */
+	ret = fcntl(lkm->fd, F_SETFD, FD_CLOEXEC);
+	if (ret < 0) {
+		perror("fcntl session fd");
+	}
+
 	session->metadata = lkm;
 
 	DBG("Kernel metadata opened (fd: %d and path: %s)", lkm->fd, lkm->pathname);
@@ -298,6 +374,12 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
 		}
 
 		lks->fd = ret;
+		/* Prevent fd duplication after execlp() */
+		ret = fcntl(lks->fd, F_SETFD, FD_CLOEXEC);
+		if (ret < 0) {
+			perror("fcntl session fd");
+		}
+
 		ret = asprintf(&lks->pathname, "%s/trace_%d",
 				channel->pathname, channel->stream_count);
 		if (ret < 0) {
@@ -336,6 +418,11 @@ int kernel_open_metadata_stream(struct ltt_kernel_session *session)
 
 	DBG("Kernel metadata stream created (fd: %d)", ret);
 	session->metadata_stream_fd = ret;
+	/* Prevent fd duplication after execlp() */
+	ret = fcntl(session->metadata_stream_fd, F_SETFD, FD_CLOEXEC);
+	if (ret < 0) {
+		perror("fcntl session fd");
+	}
 
 	return 0;