diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-06-19 22:59:48 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-06-19 22:59:48 +0000 |
| commit | 9be09e060fcb211d3e53fc93098f57b74df2cb67 (patch) | |
| tree | 4abc7be287b872bf34a7a88453e31d5186e88b1a /dlfcn/dlinfo.c | |
| parent | ae1ad3aebbc397212b4bb2eec92ff19f8c1f913a (diff) | |
| download | glibc-9be09e060fcb211d3e53fc93098f57b74df2cb67.zip glibc-9be09e060fcb211d3e53fc93098f57b74df2cb67.tar.gz glibc-9be09e060fcb211d3e53fc93098f57b74df2cb67.tar.bz2 | |
* sysdeps/generic/ldsodefs.h (rtld_global): Reorder some elements
to fill in holes
(rtld_global_ro): Likewise.
2007-06-18 Jakub Jelinek <jakub@redhat.com>
* 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/dlinfo.c')
| -rw-r--r-- | dlfcn/dlinfo.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c index 923127c..b3a3e13 100644 --- a/dlfcn/dlinfo.c +++ b/dlfcn/dlinfo.c @@ -1,5 +1,5 @@ /* dlinfo -- Get information from the dynamic linker. - Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -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) |