X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=8e960dfed8fe59786a3de2436aae3155db9851d6;hb=a62a65563c1e7cea740c5f8caf7d425174e2afbe;hp=43c6285773847739afc437de35bbb09cb0f6b0e3;hpb=335a95b7e3fab0d66908594ac7039651c7aaf6f4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 43c628577..8e960dfed 100644
--- 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,16 +622,17 @@ int kernel_validate_version(int tracer_fd)
 	}
 
 	/* Validate version */
-	if (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:
@@ -644,6 +644,7 @@ error:
  */
 int init_kernel_workarounds(void)
 {
+	int ret;
 	FILE *fp;
 
 	/*
@@ -658,7 +659,10 @@ int init_kernel_workarounds(void)
 	while (!feof(fp)) {
 		char buf[37] = "";
 
-		(void) fread(buf, 1, sizeof(buf), fp);
+		ret = fread(buf, 1, sizeof(buf), fp);
+		if (ret < 0) {
+			/* Ignore error, we don't really care */
+		}
 	}
 	fclose(fp);
 end_boot_id: