From be8f91d3d0bbef74756a021286b0ae6b1c886bc9 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Mon, 30 Oct 2017 08:56:04 +0000 Subject: [PATCH] Use MAP_PRIVATE instead of obsolete MAP_COPY. No functional changes. MFC after: 2 weeks --- libexec/rtld-elf/malloc.c | 2 +- sbin/ldconfig/ldconfig.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/malloc.c b/libexec/rtld-elf/malloc.c index a277d87f3b6..66938d005a5 100644 --- a/libexec/rtld-elf/malloc.c +++ b/libexec/rtld-elf/malloc.c @@ -479,7 +479,7 @@ int n; if ((pagepool_start = mmap(0, n * pagesz, PROT_READ|PROT_WRITE, - MAP_ANON|MAP_COPY, fd, 0)) == (caddr_t)-1) { + MAP_ANON|MAP_PRIVATE, fd, 0)) == (caddr_t)-1) { rtld_printf("Cannot map anonymous memory\n"); return 0; } diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index 85d97e68cdb..764ca3e12ab 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -550,7 +550,7 @@ readhints(void) } msize = PAGE_SIZE; - addr = mmap(0, msize, PROT_READ, MAP_COPY, fd, 0); + addr = mmap(0, msize, PROT_READ, MAP_PRIVATE, fd, 0); if (addr == MAP_FAILED) { warn("%s", hints_file); @@ -573,7 +573,7 @@ readhints(void) if (hdr->hh_ehints > msize) { fsize = hdr->hh_ehints; munmap(addr, msize); - addr = mmap(0, fsize, PROT_READ, MAP_COPY, fd, 0); + addr = mmap(0, fsize, PROT_READ, MAP_PRIVATE, fd, 0); if (addr == MAP_FAILED) { warn("%s", hints_file); return -1;