diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-execstack.c | 7 |
2 files changed, 0 insertions, 12 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 0ea27865c0..5e1b24ecb5 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -596,7 +596,6 @@ struct rtld_global_ro const ElfW(Sym) **, struct r_scope_elem *[], const struct r_found_version *, int, int, struct link_map *); - int (*_dl_check_caller) (const void *, enum allowmask); void *(*_dl_open) (const char *file, int mode, const void *caller_dlopen, Lmid_t nsid, int argc, char *argv[], char *env[]); void (*_dl_close) (void *map); @@ -1102,10 +1101,6 @@ extern size_t _dl_dst_count (const char *name) attribute_hidden; extern char *_dl_dst_substitute (struct link_map *l, const char *name, char *result) attribute_hidden; -/* Check validity of the caller. */ -extern int _dl_check_caller (const void *caller, enum allowmask mask) - attribute_hidden; - /* Open the shared object NAME, relocate it, and run its initializer if it hasn't already been run. MODE is as for `dlopen' (see <dlfcn.h>). If the object is already opened, returns its existing map. */ diff --git a/sysdeps/unix/sysv/linux/dl-execstack.c b/sysdeps/unix/sysv/linux/dl-execstack.c index c36d809d02..8ea69bdde3 100644 --- a/sysdeps/unix/sysv/linux/dl-execstack.c +++ b/sysdeps/unix/sysv/linux/dl-execstack.c @@ -22,7 +22,6 @@ #include <libintl.h> #include <stdbool.h> #include <stackinfo.h> -#include <caller.h> #include <sysdep.h> @@ -37,12 +36,6 @@ _dl_make_stack_executable (void **stack_endp) & -(intptr_t) GLRO(dl_pagesize)); int result = 0; - /* Challenge the caller. */ - if (__builtin_expect (__check_caller (RETURN_ADDRESS (0), - allow_ldso|allow_libpthread) != 0, 0) - || __builtin_expect (*stack_endp != __libc_stack_end, 0)) - return EPERM; - if (__builtin_expect (__mprotect ((void *) page, GLRO(dl_pagesize), __stack_prot) == 0, 1)) goto return_success; |