svn commit: r319134 - stable/11/libexec/rtld-elf

[Konstantin Belousov]

Author: kib
Date: Mon May 29 13:18:20 2017
New Revision: 319134
URL: https://svnweb.freebsd.org/changeset/base/319134

Log:
  MFC r318312:
  Fix the AT_EXECFD functionality.

Modified:
  stable/11/libexec/rtld-elf/map_object.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/libexec/rtld-elf/map_object.c
==============================================================================
--- stable/11/libexec/rtld-elf/map_object.c	Mon May 29 13:17:00 2017	(r319133)
+++ stable/11/libexec/rtld-elf/map_object.c	Mon May 29 13:18:20 2017	(r319134)
@@ -193,6 +193,8 @@ map_object(int fd, const char *path, con
     base_flags = MAP_PRIVATE | MAP_ANON | MAP_NOCORE;
     if (npagesizes > 1 && round_page(segs[0]->p_filesz) >= pagesizes[1])
 	base_flags |= MAP_ALIGNED_SUPER;
+    if (base_vaddr != 0)
+	base_flags |= MAP_FIXED | MAP_EXCL;
 
     mapbase = mmap(base_addr, mapsize, PROT_NONE, base_flags, -1, 0);
     if (mapbase == (caddr_t) -1) {