git: 0f434b2b5060 - main - rtld: require MAP_GUARD support
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 11 Aug 2025 11:19:29 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=0f434b2b5060b9898229a1b33a10d06616119257
commit 0f434b2b5060b9898229a1b33a10d06616119257
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-08-11 11:16:40 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-08-11 11:18:51 +0000
rtld: require MAP_GUARD support
MAP_GUARD was added prior to 12.0. We don't support such old kernels in
userspace so drop the support.
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D50731
---
libexec/rtld-elf/map_object.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c
index c6a98b50a165..5e5774c0b017 100644
--- a/libexec/rtld-elf/map_object.c
+++ b/libexec/rtld-elf/map_object.c
@@ -25,7 +25,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define _WANT_P_OSREL
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/stat.h>
@@ -43,8 +42,6 @@ static Elf_Ehdr *get_elf_header(int, const char *, const struct stat *,
Elf_Phdr **phdr);
static int convert_flags(int); /* Elf flags -> mmap flags */
-int __getosreldate(void);
-
static bool
phdr_in_zero_page(const Elf_Ehdr *hdr)
{
@@ -204,8 +201,7 @@ map_object(int fd, const char *path, const struct stat *sb, bool ismain)
segs[nsegs]->p_memsz);
mapsize = base_vlimit - base_vaddr;
base_addr = (caddr_t)base_vaddr;
- base_flags = __getosreldate() >= P_OSREL_MAP_GUARD ?
- MAP_GUARD : MAP_PRIVATE | MAP_ANON | MAP_NOCORE;
+ base_flags = MAP_GUARD;
if (npagesizes > 1 && rtld_round_page(segs[0]->p_filesz) >=
pagesizes[1])
base_flags |= MAP_ALIGNED_SUPER;