diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c --- a/lib/libc/gen/dlfcn.c +++ b/lib/libc/gen/dlfcn.c @@ -256,8 +256,23 @@ int _rtld_get_stack_prot(void) { +#ifndef IN_LIBDL + unsigned i; + int ret; + _once(&dl_phdr_info_once, dl_init_phdr_info); + for (i = 0; i < phdr_info.dlpi_phnum; i++) { + if (phdr_info.dlpi_phdr[i].p_type != PT_GNU_STACK) + continue; + ret = PROT_READ | PROT_WRITE; + if ((phdr_info.dlpi_phdr[i].p_flags & PF_X) != 0) + ret |= PROT_EXEC; + return (ret); + } return (PROT_EXEC | PROT_READ | PROT_WRITE); +#else + return (0); +#endif } #pragma weak _rtld_is_dlopened