public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] malloc: Fix transposed arguments in sysmalloc_mmap_fallback call
@ 2023-03-08 13:40 Adhemerval Zanella
  0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2023-03-08 13:40 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6a734e62f1557de3449c689effd2b37066ea34eb

commit 6a734e62f1557de3449c689effd2b37066ea34eb
Author: Robert Morell <rmorell@nvidia.com>
Date:   Tue Mar 7 10:14:45 2023 -0300

    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>

Diff:
---
 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 */

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-03-08 13:40 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-08 13:40 [glibc] malloc: Fix transposed arguments in sysmalloc_mmap_fallback call Adhemerval Zanella

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).