lttng-sessiond: Set group permissions explicitly

[lttng-tools.git] / src / bin / lttng-sessiond / kernel.c

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 6eeb9b5b1b7824802bb2da554999ca2a46e26bce..dfc0be958addc895bc1bd68384530002a6d501ac 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -204,12 +204,11 @@ int kernel_create_event(struct lttng_event *ev,
        }
 
        /*
-        * LTTNG_KERNEL_SYSCALL event creation will return 0 on success. However
-        * this FD must not be added to the event list.
+        * LTTNG_KERNEL_SYSCALL event creation will return 0 on success.
         */
        if (ret == 0 && event->event->instrumentation == LTTNG_KERNEL_SYSCALL) {
                DBG2("Kernel event syscall creation success");
-               goto end;
+               goto add_list;
        }
 
        event->fd = ret;
@@ -219,13 +218,13 @@ int kernel_create_event(struct lttng_event *ev,
                perror("fcntl session fd");
        }
 
+add_list:
        /* Add event to event list */
        cds_list_add(&event->list, &channel->events_list.head);
        channel->event_count++;
 
        DBG("Event %s created (fd: %d)", ev->name, event->fd);
 
-end:
        return 0;
 
 free_event:
@@ -623,7 +622,8 @@ int kernel_validate_version(int tracer_fd)
        }
 
        /* Validate version */
-       if (version.version > KERN_MODULES_VERSION) {
+       if (version.version != KERN_MODULES_PRE_VERSION
+               && version.version != KERN_MODULES_VERSION) {
                goto error_version;
        }