From db34449e0268698d2a21c68bfd96f62dc6e84c16 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 9 Feb 2021 11:04:25 -0500 Subject: [PATCH] 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 Signed-off-by: Mathieu Desnoyers Change-Id: Ia42a5dc0dfddf64515aea144283af5cc0c3b97e0 --- include/lttng/kernel-version.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/lttng/kernel-version.h b/include/lttng/kernel-version.h index a41829f0..747a674f 100644 --- a/include/lttng/kernel-version.h +++ b/include/lttng/kernel-version.h @@ -11,6 +11,7 @@ #define _LTTNG_KERNEL_VERSION_H #include +#include #include /* @@ -40,19 +41,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 -- 2.34.1