mirror of
https://sourceware.org/git/glibc.git
synced 2025-12-24 17:51:17 +03:00
Update.
2004-03-26 Ulrich Drepper <drepper@redhat.com> * elf/dl-caller.c: New file. * include/caller.h: New file. * Makefile (distribute): Add include/caller.h. * elf/Makefile (dl-routines): Add dl-caller. * elf/dl-load.c (_dl_map_object_from_fd): Record l_text_end. * elf/dl-open.c (check_libc_caller): Removed. (dl_open_worker): Use __check_caller instead. * elf/rtld.c (_rtld_global_ro): Initialize _dl_check_caller. (_dl_start_final): Record l_text_end for ld.so map. (dl_main): Record l_text_end for main object and vdso. * include/link.h (struct link_map): Add l_text_end field. * sysdeps/generic/ldsodefs.h (struct rtld_global_ro): Add _dl_check_caller field. Define enum allowmask. Add declaration of _dl_check_caller. * sysdeps/unix/sysv/linux/dl-execstack.c: Also use __check_caller test.
This commit is contained in:
@@ -1110,7 +1110,7 @@ cannot allocate TLS data structures for initial thread");
|
||||
unallocated. Then jump into the normal segment-mapping loop to
|
||||
handle the portion of the segment past the end of the file
|
||||
mapping. */
|
||||
__mprotect ((caddr_t) (l->l_addr + c->mapend),
|
||||
__mprotect ((caddr_t) l->l_text_end,
|
||||
loadcmds[nloadcmds - 1].allocend - c->mapend,
|
||||
PROT_NONE);
|
||||
|
||||
@@ -1146,6 +1146,9 @@ cannot allocate TLS data structures for initial thread");
|
||||
goto map_error;
|
||||
|
||||
postmap:
|
||||
if (c->prot & PROT_EXEC)
|
||||
l->l_text_end = l->l_addr + c->mapend;
|
||||
|
||||
if (l->l_phdr == 0
|
||||
&& (ElfW(Off)) c->mapoff <= header->e_phoff
|
||||
&& ((size_t) (c->mapend - c->mapstart + c->mapoff)
|
||||
|
||||
Reference in New Issue
Block a user