From: H.J. Lu <hjl.tools@gmail.com>
Date: Mon, 13 Dec 2021 15:17:29 +0000 (-0800)
Subject: elf: Align argument of __munmap to page size [BZ #28676]
X-Git-Tag: glibc-2.35~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd6062ede31963a1a10a77e66582a795ecff9ba1;p=thirdparty%2Fglibc.git

elf: Align argument of __munmap to page size [BZ #28676]

On Linux/x86-64, for elf/tst-align3, we now get

munmap(0x7f88f9401000, 1126424)         = 0

instead of

munmap(0x7f1615200018, 544768)          = -1 EINVAL (Invalid argument)

Reviewed-by: Florian Weimer <fweimer@redhat.com>
---

diff --git a/elf/dl-map-segments.h b/elf/dl-map-segments.h
index 70a4c406950..54e606aa873 100644
--- a/elf/dl-map-segments.h
+++ b/elf/dl-map-segments.h
@@ -55,6 +55,7 @@ _dl_map_segment (const struct loadcmd *c, ElfW(Addr) mappref,
       if (delta)
 	__munmap ((void *) map_start, delta);
       ElfW(Addr) map_end = map_start_aligned + maplength;
+      map_end = ALIGN_UP (map_end, GLRO(dl_pagesize));
       delta = map_start + maplen - map_end;
       if (delta)
 	__munmap ((void *) map_end, delta);