From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Fri, 12 Mar 2021 09:46:15 +0000 (+0000)
Subject: malloc: Use different tag after mremap
X-Git-Tag: glibc-2.34~769
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14652f60a425458ad6e8eefdae6ff4003124b321;p=thirdparty%2Fglibc.git

malloc: Use different tag after mremap

The comment explained why different tag is used after mremap, but
for that correctly tagged pointer should be passed to tag_new_usable.
Use chunk2mem to get the tag.

Reviewed-by: DJ Delorie <dj@redhat.com>
---

diff --git a/malloc/malloc.c b/malloc/malloc.c
index a2c550df066..ebcf1ff9603 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -3411,7 +3411,7 @@ __libc_realloc (void *oldmem, size_t bytes)
       newp = mremap_chunk (oldp, nb);
       if (newp)
 	{
-	  void *newmem = chunk2rawmem (newp);
+	  void *newmem = chunk2mem (newp);
 	  /* Give the new block a different tag.  This helps to ensure
 	     that stale handles to the previous mapping are not
 	     reused.  There's a performance hit for both us and the