projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: cast LTTNG_KERNEL_VERSION/LTTNG_LINUX_VERSION_CODE to uint64_t
[lttng-modules.git]
/
lttng-kernel-version.h
diff --git
a/lttng-kernel-version.h
b/lttng-kernel-version.h
index 8a870ce1e49dc2e9b8284a32b1b73f22a6911f73..d5024a0558dc7c915b11f3c048def3c1bd491705 100644
(file)
--- a/
lttng-kernel-version.h
+++ b/
lttng-kernel-version.h
@@
-52,19
+52,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.
* 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) \
*/
#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_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
#endif
This page took
0.023233 seconds
and
4
git commands to generate.