Fix: incorrect close of fd 0 for syscall kernel event destroy

[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 dfc0be958addc895bc1bd68384530002a6d501ac..2936406d84f704d1a293e95dd21f248e5c5660b3 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -208,6 +208,11 @@ int kernel_create_event(struct lttng_event *ev,
         */
        if (ret == 0 && event->event->instrumentation == LTTNG_KERNEL_SYSCALL) {
                DBG2("Kernel event syscall creation success");
+               /*
+                * We use fd == -1 to ensure that we never trigger a close of fd
+                * 0.
+                */
+               event->fd = -1;
                goto add_list;
        }
 
@@ -483,7 +488,7 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
        int ret;
        struct ltt_kernel_stream *lks;
 
-       while ((ret = kernctl_create_stream(channel->fd)) > 0) {
+       while ((ret = kernctl_create_stream(channel->fd)) >= 0) {
                lks = trace_kernel_create_stream();
                if (lks == NULL) {
                        close(ret);
@@ -622,17 +627,17 @@ int kernel_validate_version(int tracer_fd)
        }
 
        /* Validate version */
-       if (version.version != KERN_MODULES_PRE_VERSION
-               && version.version != KERN_MODULES_VERSION) {
+       if (version.major != KERN_MODULES_PRE_MAJOR
+               && version.major != KERN_MODULES_MAJOR) {
                goto error_version;
        }
 
-       DBG2("Kernel tracer version validated (major version %d)", version.version);
+       DBG2("Kernel tracer version validated (major version %d)", version.major);
        return 0;
 
 error_version:
        ERR("Kernel major version %d is not compatible (supporting <= %d)",
-                       version.version, KERN_MODULES_VERSION)
+                       version.major, KERN_MODULES_MAJOR)
        ret = -1;
 
 error: