diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-07 17:31:45 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-07 17:31:45 +0000 |
| commit | a1ce84f35f28616163778cd63878e12e65ddb97b (patch) | |
| tree | 5d20132d84a9af620f21126320f44126b4d4c742 /dlfcn | |
| parent | 5daa0615659c5651d48e39ba7c17db769bbe10d4 (diff) | |
| download | glibc-a1ce84f35f28616163778cd63878e12e65ddb97b.tar.gz | |
* sysdeps/generic/ldsodefs.h (rtld_global): Reorder some elements
to fill in holes
(rtld_global_ro): Likewise.
* elf/dl-addr.c (_dl_addr): Skip PT_LOAD checking if l_contiguous.
Move PT_LOAD checking to...
(_dl_addr_inside_object): ... here, new function.
* elf/dl-sym.c (do_sym): If not l_contiguous,
call _dl_addr_inside_object.
* elf/dl-iteratephdr.c (__dl_iterate_phdr): Likewise.
* dlfcn/dlinfo.c (dlinfo_doit): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
(_dl_addr_inside_object): New function if IS_IN_rtld.
* elf/dl-load.c (_dl_map_object_from_fd): Set l_contiguous if no
holes are present or are PROT_NONE protected.
* include/link.h (struct link_map): Add l_contiguous field.
* sysdeps/generic/ldsodefs.h (_dl_addr_inside_object): New prototype.
Diffstat (limited to 'dlfcn')
| -rw-r--r-- | dlfcn/dlinfo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c index 923127cbf3..3a66d396ee 100644 --- a/dlfcn/dlinfo.c +++ b/dlfcn/dlinfo.c @@ -56,9 +56,8 @@ dlinfo_doit (void *argsblock) /* Find the highest-addressed object that CALLER is not below. */ for (nsid = 0; nsid < DL_NNS; ++nsid) for (l = GL(dl_ns)[nsid]._ns_loaded; l != NULL; l = l->l_next) - if (caller >= l->l_map_start && caller < l->l_map_end) - /* There must be exactly one DSO for the range of the virtual - memory. Otherwise something is really broken. */ + if (caller >= l->l_map_start && caller < l->l_map_end + && (l->l_contiguous || _dl_addr_inside_object (l, caller))) break; if (l == NULL) |