From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 5 Feb 2021 20:21:55 +0000 (-0500)
Subject: fix: UTS_UBUNTU_RELEASE_ABI is close to overflow
X-Git-Tag: v2.12.5~11
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=140ade7579fb78822566924134d4547c24614d4f;p=lttng-modules.git

fix: UTS_UBUNTU_RELEASE_ABI is close to overflow

We allocated only 8bits for UTS_UBUNTU_RELEASE_ABI in
LTTNG_UBUNTU_KERNEL_VERSION, the current Xenial kernel has an ABI of 207
which is getting close to 256. Bump it to 16bits to avoid breakage in
the future.

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

diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h
index 806d978b..42d748f9 100644
--- a/lttng-kernel-version.h
+++ b/lttng-kernel-version.h
@@ -67,11 +67,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