From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 17 Nov 2011 04:59:28 +0000 (-0500)
Subject: fix issue with excessive mremap syscalls on realloc
X-Git-Tag: v0.8.4~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e5d78fe8df9bd61940abcd98ad07ed69b7da4350;p=oweals%2Fmusl.git

fix issue with excessive mremap syscalls on realloc

CHUNK_SIZE macro was defined incorrectly and shaving off at least one
significant bit in the size of mmapped chunks, resulting in the test
for oldlen==newlen always failing and incurring a syscall. fortunately
i don't think this issue caused any other observable behavior; the
definition worked correctly for all non-mmapped chunks where its
correctness matters more, since their lengths are always multiples of
the alignment.
---

diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c
index abf3e8fa..39c7d051 100644
--- a/src/malloc/malloc.c
+++ b/src/malloc/malloc.c
@@ -43,8 +43,8 @@ static struct {
 #define DONTCARE 16
 #define RECLAIM 163840
 
-#define CHUNK_SIZE(c) ((c)->csize & SIZE_MASK)
-#define CHUNK_PSIZE(c) ((c)->psize & SIZE_MASK)
+#define CHUNK_SIZE(c) ((c)->csize & -2)
+#define CHUNK_PSIZE(c) ((c)->psize & -2)
 #define PREV_CHUNK(c) ((struct chunk *)((char *)(c) - CHUNK_PSIZE(c)))
 #define NEXT_CHUNK(c) ((struct chunk *)((char *)(c) + CHUNK_SIZE(c)))
 #define MEM_TO_CHUNK(p) (struct chunk *)((char *)(p) - OVERHEAD)
@@ -52,8 +52,6 @@ static struct {
 #define BIN_TO_CHUNK(i) (MEM_TO_CHUNK(&mal.bins[i].head))
 
 #define C_INUSE  ((size_t)1)
-#define C_FLAGS  ((size_t)3)
-#define C_SIZE   SIZE_MASK
 
 #define IS_MMAPPED(c) !((c)->csize & (C_INUSE))