packages/glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

malloc: Fix transposed arguments in sysmalloc_mmap_fallback call

Browse Source 
(cherry picked from commit 5fd83b1e3edd02c5098cc3776715103c97bd5ac0)
This commit is contained in:
liqingqing_1229 2023-03-14 14:24:31 +08:00 committed by openeuler-sync-bot
parent 89404a4686
commit c96c4bdfd7
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glibc.spec
View File

@ -66,7 +66,7 @@
############################################################################## ##############################################################################
Name: glibc Name: glibc
Version: 2.34 Version: 2.34
Release: 112 Release: 113
Summary: The GNU libc libraries Summary: The GNU libc libraries
License: %{all_license} License: %{all_license}
URL: http://www.gnu.org/software/glibc/ 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 Patch159: io-Fix-use-after-free-in-ftw-BZ-26779.patch
Patch160: backport-x86-Fix-wcsnlen-avx2-page-cross-length-comparison-BZ.patch Patch160: backport-x86-Fix-wcsnlen-avx2-page-cross-length-comparison-BZ.patch
Patch161: gmon-Fix-allocated-buffer-overflow-bug-29444.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 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 Patch9001: delete-no-hard-link-to-avoid-all_language-package-to.patch
@ -1450,6 +1451,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Mar 14 2023 Qingqing Li <liqingqing3@huawei.com> - 2.34-113
- malloc: Fix transposed arguments in sysmalloc_mmap_fallback call
* Sat Feb 25 2023 Lv Ying <lvying6@huawei.com> - 2.34-112 * Sat Feb 25 2023 Lv Ying <lvying6@huawei.com> - 2.34-112
- elf/ld.so: ld.so mmap shared object use hugepage new feature and bugfix: - elf/ld.so: ld.so mmap shared object use hugepage new feature and bugfix:
- feature: support HUGEPAGE_PROBE + hugepageedit mark shared object - feature: support HUGEPAGE_PROBE + hugepageedit mark shared object

37
malloc-Fix-transposed-arguments-in-sysmalloc_mmap_fa.patch Normal file
View File

@ -0,0 +1,37 @@
From 6a734e62f1557de3449c689effd2b37066ea34eb Mon Sep 17 00:00:00 2001
From: Robert Morell <rmorell@nvidia.com>
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 <rmorell@nvidia.com>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---
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