X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-kernel-version.h;h=ed953fda250aaee49398965f0489b863d5db7987;hb=d92127bf7371a958a8979665f52b933a9c239ba0;hp=806d978ba6debb946af3f47b8703a5b2a9f2f9b2;hpb=919f286898a7782eeb8483cd31a52a77a31562b3;p=lttng-modules.git

diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h
index 806d978b..ed953fda 100644
--- 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
 
@@ -67,11 +70,11 @@
 /* Ubuntu */
 
 #define LTTNG_UBUNTU_KERNEL_VERSION(a, b, c, d) \
-	(((LTTNG_KERNEL_VERSION(a, b, c)) << 8) + (d))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) << 16) + (d))
 
 #ifdef UTS_UBUNTU_RELEASE_ABI
 #define LTTNG_UBUNTU_VERSION_CODE \
-	((LTTNG_LINUX_VERSION_CODE << 8) + UTS_UBUNTU_RELEASE_ABI)
+	((LTTNG_LINUX_VERSION_CODE << 16) + UTS_UBUNTU_RELEASE_ABI)
 #else
 #define LTTNG_UBUNTU_VERSION_CODE 	0
 #endif
@@ -103,13 +106,13 @@
 		LTTNG_DEBIAN_KERNEL_VERSION(a_high, b_high, c_high, d_high, e_high, f_high))
 
 #define LTTNG_RHEL_KERNEL_VERSION(a, b, c, d, e, f) \
-	(((LTTNG_KERNEL_VERSION(a, b, c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) * 100000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
 
 /* RHEL */
 
 #ifdef RHEL_API_VERSION
 #define LTTNG_RHEL_VERSION_CODE \
-	((LTTNG_LINUX_VERSION_CODE * 10000000ULL) + RHEL_API_VERSION)
+	((LTTNG_LINUX_VERSION_CODE * 100000000ULL) + RHEL_API_VERSION)
 #else
 #define LTTNG_RHEL_VERSION_CODE		0
 #endif
@@ -124,11 +127,11 @@
 /* SUSE Linux enterprise */
 
 #define LTTNG_SLE_KERNEL_VERSION(a, b, c, d, e, f) \
-	(((LTTNG_KERNEL_VERSION(a, b, c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) * 100000000ULL) + ((d) * 100000) + ((e) * 100) + (f))
 
 #ifdef SLE_API_VERSION
 #define LTTNG_SLE_VERSION_CODE \
-	((LTTNG_LINUX_VERSION_CODE * 10000000ULL) + SLE_API_VERSION)
+	((LTTNG_LINUX_VERSION_CODE * 100000000ULL) + SLE_API_VERSION)
 #else
 #define LTTNG_SLE_VERSION_CODE 	0
 #endif
@@ -162,11 +165,11 @@
 /* RT patch */
 
 #define LTTNG_RT_KERNEL_VERSION(a, b, c, d) \
-	(((LTTNG_KERNEL_VERSION(a, b, c)) << 8) + (d))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) << 16) + (d))
 
 #ifdef RT_PATCH_VERSION
 #define LTTNG_RT_VERSION_CODE \
-	((LTTNG_LINUX_VERSION_CODE << 8) + RT_PATCH_VERSION)
+	((LTTNG_LINUX_VERSION_CODE << 16) + RT_PATCH_VERSION)
 #else
 #define LTTNG_RT_VERSION_CODE 	0
 #endif