fix: cast LTTNG_KERNEL_VERSION/LTTNG_LINUX_VERSION_CODE to uint64_t

Cast our version macros to an unsigned 64bits value to prevent
overflowing when we append distro specific version information.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I5af74cffe57cfe44c6e4a951c7a1270028650aa5

diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h
index 42d748f9c415653202da20e0633a35b2cd1d0b68..7bed5a90812c956517a77783f510ff2305f53f56 100644 (file)
--- a/lttng-kernel-version.h
+++ b/lttng-kernel-version.h
@@ -40,19 +40,22 @@
  * of LINUX_VERSION_CODE from the kernel headers and allocate 16bits.
  * Otherwise, keep using the version code from the headers to minimise the
  * behavior change and avoid regressions.
+ *
+ * Cast the result to uint64_t to prevent overflowing when we append distro
+ * specific version information.
  */
 #if (LTTNG_LINUX_PATCH >= 256)
 
 #define LTTNG_KERNEL_VERSION(a, b, c) \
-       (((a) << 24) + ((b) << 16) + (c))
+       ((((a) << 24) + ((b) << 16) + (c)) * 1ULL)
 
 #define LTTNG_LINUX_VERSION_CODE \
        LTTNG_KERNEL_VERSION(LTTNG_LINUX_MAJOR, LTTNG_LINUX_MINOR, LTTNG_LINUX_PATCH)
 
 #else
 
-#define LTTNG_KERNEL_VERSION(a, b, c) KERNEL_VERSION(a, b, c)
-#define LTTNG_LINUX_VERSION_CODE LINUX_VERSION_CODE
+#define LTTNG_KERNEL_VERSION(a, b, c) (KERNEL_VERSION(a, b, c) * 1ULL)
+#define LTTNG_LINUX_VERSION_CODE (LINUX_VERSION_CODE * 1ULL)
 
 #endif