diff --git a/glibc.spec b/glibc.spec index 7943f0adfbae593fe8c18dda538774e80d702fff..54a9dd6b33fadfe2da28694828ad008f70e99e5f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -66,7 +66,7 @@ ############################################################################## Name: glibc Version: 2.34 -Release: 112 +Release: 113 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -246,6 +246,7 @@ Patch158: backport-elf-Do-not-completely-clear-reused-namespace-in-dlmo.patch Patch159: io-Fix-use-after-free-in-ftw-BZ-26779.patch Patch160: backport-x86-Fix-wcsnlen-avx2-page-cross-length-comparison-BZ.patch Patch161: gmon-Fix-allocated-buffer-overflow-bug-29444.patch +Patch162: malloc-Fix-transposed-arguments-in-sysmalloc_mmap_fa.patch Patch9000: turn-default-value-of-x86_rep_stosb_threshold_form_2K_to_1M.patch Patch9001: delete-no-hard-link-to-avoid-all_language-package-to.patch @@ -1450,6 +1451,9 @@ fi %endif %changelog +* Tue Mar 14 2023 Qingqing Li - 2.34-113 +- malloc: Fix transposed arguments in sysmalloc_mmap_fallback call + * Sat Feb 25 2023 Lv Ying - 2.34-112 - elf/ld.so: ld.so mmap shared object use hugepage new feature and bugfix: - feature: support HUGEPAGE_PROBE + hugepageedit mark shared object diff --git a/malloc-Fix-transposed-arguments-in-sysmalloc_mmap_fa.patch b/malloc-Fix-transposed-arguments-in-sysmalloc_mmap_fa.patch new file mode 100644 index 0000000000000000000000000000000000000000..fbd1059d788217bbe13b8a0e580aa6803d472b89 --- /dev/null +++ b/malloc-Fix-transposed-arguments-in-sysmalloc_mmap_fa.patch @@ -0,0 +1,37 @@ +From 6a734e62f1557de3449c689effd2b37066ea34eb Mon Sep 17 00:00:00 2001 +From: Robert Morell +Date: Tue, 7 Mar 2023 10:14:45 -0300 +Subject: [PATCH] malloc: Fix transposed arguments in sysmalloc_mmap_fallback + call + +git commit 0849eed45daa ("malloc: Move MORECORE fallback mmap to +sysmalloc_mmap_fallback") moved a block of code from sysmalloc to a +new helper function sysmalloc_mmap_fallback(), but 'pagesize' is used +for the 'minsize' argument and 'MMAP_AS_MORECORE_SIZE' for the +'pagesize' argument. + +Fixes: 0849eed45daa ("malloc: Move MORECORE fallback mmap to sysmalloc_mmap_fallback") +Signed-off-by: Robert Morell +Reviewed-by: Adhemerval Zanella +--- + malloc/malloc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 5829f3fa9b..76c50e3f58 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -2725,8 +2725,8 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av) + mp_.hp_flags, av); + #endif + if (mbrk == MAP_FAILED) +- mbrk = sysmalloc_mmap_fallback (&size, nb, old_size, pagesize, +- MMAP_AS_MORECORE_SIZE, 0, av); ++ mbrk = sysmalloc_mmap_fallback (&size, nb, old_size, MMAP_AS_MORECORE_SIZE, ++ pagesize, 0, av); + if (mbrk != MAP_FAILED) + { + /* We do not need, and cannot use, another sbrk call to find end */ +-- +2.33.0 +