From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 7CA923850877; Wed, 8 Mar 2023 13:40:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7CA923850877 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678282803; bh=44UstlBeiDiYZIuYzOseRiKc6tWfSPfkUeqLQYa8RQ4=; h=From:To:Subject:Date:From; b=n/G1AjIwFpagMlq8/MP/afd7poEue+rrlOTv+rN9L+LBvRqz9mzjzanEwdDUGIz1e +jOSJ7lMVeRLHe/oQD5o22DnS5D4+vcF/Cyf1ppon1/JE5KoB+kP0zmuLsAbfDHGUz 78Fs+ER9Fa/KEecVEbpl2vpIsdQvWjqw4BTQfWys= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] malloc: Fix transposed arguments in sysmalloc_mmap_fallback call X-Act-Checkin: glibc X-Git-Author: Robert Morell X-Git-Refname: refs/heads/master X-Git-Oldrev: 0b7bf0e0a486da6be7c5dde742a80c1138f9cc89 X-Git-Newrev: 6a734e62f1557de3449c689effd2b37066ea34eb Message-Id: <20230308134003.7CA923850877@sourceware.org> Date: Wed, 8 Mar 2023 13:40:03 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6a734e62f1557de3449c689effd2b37066ea34eb commit 6a734e62f1557de3449c689effd2b37066ea34eb Author: Robert Morell 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 Reviewed-by: Adhemerval Zanella 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 */