X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=86a1957cf400a2f8c6cd080ff42c28a864dda427;hb=0c95f5b2ec754e905a0263cafc6e453f451d0ded;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..86a1957cf 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -623,7 +623,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;
 	}
 
@@ -644,6 +645,7 @@ error:
  */
 int init_kernel_workarounds(void)
 {
+	int ret;
 	FILE *fp;
 
 	/*
@@ -658,7 +660,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: