From: Greg Kroah-Hartman Date: Wed, 19 Jun 2024 09:52:18 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v6.1.95~42 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17d47f71def38aeb0a648ab2f508af666b3c49e6;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: hugetlb_encode.h-fix-undefined-behaviour-34-26.patch --- diff --git a/queue-5.4/hugetlb_encode.h-fix-undefined-behaviour-34-26.patch b/queue-5.4/hugetlb_encode.h-fix-undefined-behaviour-34-26.patch new file mode 100644 index 00000000000..9d62b3d8838 --- /dev/null +++ b/queue-5.4/hugetlb_encode.h-fix-undefined-behaviour-34-26.patch @@ -0,0 +1,95 @@ +From 710bb68c2e3a24512e2d2bae470960d7488e97b1 Mon Sep 17 00:00:00 2001 +From: Matthias Goergens +Date: Mon, 5 Sep 2022 11:19:04 +0800 +Subject: hugetlb_encode.h: fix undefined behaviour (34 << 26) + +From: Matthias Goergens + +commit 710bb68c2e3a24512e2d2bae470960d7488e97b1 upstream. + +Left-shifting past the size of your datatype is undefined behaviour in C. +The literal 34 gets the type `int`, and that one is not big enough to be +left shifted by 26 bits. + +An `unsigned` is long enough (on any machine that has at least 32 bits for +their ints.) + +For uniformity, we mark all the literals as unsigned. But it's only +really needed for HUGETLB_FLAG_ENCODE_16GB. + +Thanks to Randy Dunlap for an initial review and suggestion. + +Link: https://lkml.kernel.org/r/20220905031904.150925-1-matthias.goergens@gmail.com +Signed-off-by: Matthias Goergens +Acked-by: Randy Dunlap +Cc: Mike Kravetz +Cc: Muchun Song +Signed-off-by: Andrew Morton +[cmllamas: fix trivial conflict due to missing page encondigs] +Signed-off-by: Carlos Llamas +Signed-off-by: Greg Kroah-Hartman +--- + include/uapi/asm-generic/hugetlb_encode.h | 24 ++++++++++++------------ + tools/include/asm-generic/hugetlb_encode.h | 20 ++++++++++---------- + 2 files changed, 22 insertions(+), 22 deletions(-) + +--- a/include/uapi/asm-generic/hugetlb_encode.h ++++ b/include/uapi/asm-generic/hugetlb_encode.h +@@ -20,17 +20,17 @@ + #define HUGETLB_FLAG_ENCODE_SHIFT 26 + #define HUGETLB_FLAG_ENCODE_MASK 0x3f + +-#define HUGETLB_FLAG_ENCODE_64KB (16 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_512KB (19 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_1MB (20 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_2MB (21 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_8MB (23 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_16MB (24 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_32MB (25 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_256MB (28 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_512MB (29 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_1GB (30 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_2GB (31 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_16GB (34 << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_64KB (16U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_512KB (19U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_1MB (20U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_2MB (21U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_8MB (23U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_16MB (24U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_32MB (25U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_256MB (28U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_512MB (29U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_1GB (30U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_2GB (31U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_16GB (34U << HUGETLB_FLAG_ENCODE_SHIFT) + + #endif /* _ASM_GENERIC_HUGETLB_ENCODE_H_ */ +--- a/tools/include/asm-generic/hugetlb_encode.h ++++ b/tools/include/asm-generic/hugetlb_encode.h +@@ -20,15 +20,15 @@ + #define HUGETLB_FLAG_ENCODE_SHIFT 26 + #define HUGETLB_FLAG_ENCODE_MASK 0x3f + +-#define HUGETLB_FLAG_ENCODE_64KB (16 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_512KB (19 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_1MB (20 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_2MB (21 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_8MB (23 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_16MB (24 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_256MB (28 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_1GB (30 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_2GB (31 << HUGETLB_FLAG_ENCODE_SHIFT) +-#define HUGETLB_FLAG_ENCODE_16GB (34 << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_64KB (16U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_512KB (19U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_1MB (20U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_2MB (21U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_8MB (23U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_16MB (24U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_256MB (28U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_1GB (30U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_2GB (31U << HUGETLB_FLAG_ENCODE_SHIFT) ++#define HUGETLB_FLAG_ENCODE_16GB (34U << HUGETLB_FLAG_ENCODE_SHIFT) + + #endif /* _ASM_GENERIC_HUGETLB_ENCODE_H_ */ diff --git a/queue-5.4/series b/queue-5.4/series index 6ad46b758b6..196db51d85b 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -96,3 +96,4 @@ intel_th-pci-add-lunar-lake-support.patch nilfs2-fix-potential-kernel-bug-due-to-lack-of-writeback-flag-waiting.patch tick-nohz_full-don-t-abuse-smp_call_function_single-in-tick_setup_device.patch hv_utils-drain-the-timesync-packets-on-onchannelcallback.patch +hugetlb_encode.h-fix-undefined-behaviour-34-26.patch