From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Fri, 12 Mar 2021 14:30:10 +0000 (+0000)
Subject: malloc: Remove unnecessary tagging around _mid_memalign
X-Git-Tag: glibc-2.34~766
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05f878c58e53370a76c2b82679899936bc69c714;p=thirdparty%2Fglibc.git

malloc: Remove unnecessary tagging around _mid_memalign

The internal _mid_memalign already returns newly tagged memory.
(__libc_memalign and posix_memalign already relied on this, this
patch fixes the other call sites.)

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

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 432b042f25d..7c44b4f96d4 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -3553,22 +3553,17 @@ libc_hidden_def (__libc_memalign)
 void *
 __libc_valloc (size_t bytes)
 {
-  void *p;
-
   if (__malloc_initialized < 0)
     ptmalloc_init ();
 
   void *address = RETURN_ADDRESS (0);
   size_t pagesize = GLRO (dl_pagesize);
-  p = _mid_memalign (pagesize, bytes, address);
-  return tag_new_usable (p);
+  return _mid_memalign (pagesize, bytes, address);
 }
 
 void *
 __libc_pvalloc (size_t bytes)
 {
-  void *p;
-
   if (__malloc_initialized < 0)
     ptmalloc_init ();
 
@@ -3585,8 +3580,7 @@ __libc_pvalloc (size_t bytes)
     }
   rounded_bytes = rounded_bytes & -(pagesize - 1);
 
-  p = _mid_memalign (pagesize, rounded_bytes, address);
-  return tag_new_usable (p);
+  return _mid_memalign (pagesize, rounded_bytes, address);
 }
 
 void *