diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | elf/dl-minimal.c | 12 |
2 files changed, 9 insertions, 7 deletions
@@ -1,3 +1,7 @@ +2016-04-23 H.J. Lu <hongjiu.lu@intel.com> + + * elf/dl-minimal.c (__libc_memalign): Mmap one extra page. + 2016-04-23 Mike Frysinger <vapier@gentoo.org> * locale/programs/ld-time.c (time_finish): Set week_1stweek to 7 diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c index 762e65b4d0..c8a8f8dc93 100644 --- a/elf/dl-minimal.c +++ b/elf/dl-minimal.c @@ -66,15 +66,13 @@ __libc_memalign (size_t align, size_t n) if (alloc_ptr + n >= alloc_end || n >= -(uintptr_t) alloc_ptr) { - /* Insufficient space left; allocate another page. */ + /* Insufficient space left; allocate another page plus one extra + page to reduce number of mmap calls. */ caddr_t page; size_t nup = (n + GLRO(dl_pagesize) - 1) & ~(GLRO(dl_pagesize) - 1); - if (__glibc_unlikely (nup == 0)) - { - if (n) - return NULL; - nup = GLRO(dl_pagesize); - } + if (__glibc_unlikely (nup == 0 && n != 0)) + return NULL; + nup += GLRO(dl_pagesize); page = __mmap (0, nup, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0); if (page == MAP_FAILED) |