diff --git a/glibc-upstream-2.39-bz-32470.patch b/glibc-upstream-2.39-bz-32470.patch deleted file mode 100644 index a28ce33..0000000 --- a/glibc-upstream-2.39-bz-32470.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2c8a7f14fac3628b6a06cc76cdfda54a7ac20386 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Tue, 17 Dec 2024 18:12:03 +0100 -Subject: [PATCH] x86: Avoid integer truncation with large cache sizes (bug - 32470) - -Some hypervisors report 1 TiB L3 cache size. This results -in some variables incorrectly getting zeroed, causing crashes -in memcpy/memmove because invariants are violated. - -(cherry picked from commit 61c3450db96dce96ad2b24b4f0b548e6a46d68e5) ---- - sysdeps/x86/dl-cacheinfo.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h -index 5a98f70364..1f68968a9a 100644 ---- a/sysdeps/x86/dl-cacheinfo.h -+++ b/sysdeps/x86/dl-cacheinfo.h -@@ -959,11 +959,11 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - non_temporal_threshold = maximum_non_temporal_threshold; - - /* NB: The REP MOVSB threshold must be greater than VEC_SIZE * 8. */ -- unsigned int minimum_rep_movsb_threshold; -+ unsigned long int minimum_rep_movsb_threshold; - /* NB: The default REP MOVSB threshold is 4096 * (VEC_SIZE / 16) for - VEC_SIZE == 64 or 32. For VEC_SIZE == 16, the default REP MOVSB - threshold is 2048 * (VEC_SIZE / 16). */ -- unsigned int rep_movsb_threshold; -+ unsigned long int rep_movsb_threshold; - if (CPU_FEATURE_USABLE_P (cpu_features, AVX512F) - && !CPU_FEATURE_PREFERRED_P (cpu_features, Prefer_No_AVX512)) - { --- -2.46.2 - diff --git a/glibc.spec b/glibc.spec index 8b0776b..58fe44d 100644 --- a/glibc.spec +++ b/glibc.spec @@ -509,9 +509,6 @@ Patch191: glibc-RHEL-75555.patch Patch192: glibc-RHEL-75809-2.patch Patch193: glibc-RHEL-75809-3.patch -# AlmaLinux Patch -Patch1000: glibc-upstream-2.39-bz-32470.patch - ############################################################################## # Continued list of core "glibc" package information: ############################################################################## @@ -2512,9 +2509,6 @@ update_gconv_modules_cache () * Tue Feb 11 2025 Eduard Abdullin - 2.39-37.alma.1 - Overwrite target for x86_64_v2 -* Tue Feb 11 2025 Koichiro Iwao - 2.39-37.alma.1 -- Apply patch from upstream BZ #32470 - * Fri Jan 24 2025 Florian Weimer - 2.39-37 - setenv: Rework free(environ) compatibility support (RHEL-75809)