aboutsummaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2021-10-15 17:59:37 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2021-10-18 22:02:47 +0000
commit73dddffc3175581ba99f6ced9a2e508a0e880e59 (patch)
tree73e9baf189054e57ede9bc5c7b79b7e0b72ad14e /libexec
parente1d6d6f9249d37c10a0df68024c7dacebdc7bf98 (diff)
Diffstat (limited to 'libexec')
-rw-r--r--libexec/rtld-elf/rtld_malloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c
index 64218b5bb786..63fa6f5e2ee7 100644
--- a/libexec/rtld-elf/rtld_malloc.c
+++ b/libexec/rtld-elf/rtld_malloc.c
@@ -271,21 +271,21 @@ morepages(int n)
}
}
- if (pagepool_start == MAP_FAILED)
- pagepool_start = 0;
offset = (uintptr_t)pagepool_start - rounddown2(
(uintptr_t)pagepool_start, pagesz);
- pagepool_start = mmap(0, n * pagesz, PROT_READ | PROT_WRITE,
+ addr = mmap(0, n * pagesz, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, -1, 0);
- if (pagepool_start == MAP_FAILED) {
+ if (addr == MAP_FAILED) {
#ifdef IN_RTLD
rtld_fdprintf(STDERR_FILENO, _BASENAME_RTLD ": morepages: "
"cannot mmap anonymous memory: %s\n",
rtld_strerror(errno));
#endif
+ pagepool_start = pagepool_end = NULL;
return (0);
}
+ pagepool_start = addr;
pagepool_end = pagepool_start + n * pagesz;
pagepool_start += offset;