38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
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
|
|
|