From 6f182b5468d6f80dfbd1002ad3966c904686ca40 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: I5af74cffe57cfe44c6e4a951c7a1270028650aa5 --- lttng-kernel-version.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h index 42d748f9..7bed5a90 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 -- 2.34.1