From 07842fefbd73376d7a5ee568be3770bd46814f73 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 5 Feb 2021 15:21:55 -0500 Subject: [PATCH] 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 Signed-off-by: Mathieu Desnoyers Change-Id: Ib094b73d42e81aeeb74206224373a032d5c65dee --- lttng-kernel-version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h index e7fffe60..8a870ce1 100644 --- a/lttng-kernel-version.h +++ b/lttng-kernel-version.h @@ -85,11 +85,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 -- 2.34.1