mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 01:00:07 +00:00
0d23a5c1b1
Fixes to address issues from BZ #15022 resolution, as follows: * TLS updates to csu/libc-tls.c -- we now have a proper main map, so there's no longer a need to create a separate fake one to keep TLS structures, * random updates to elf/dl-close.c -- LM_ID_BASE is now a valid name space ID for static executables as well, so assert that we don't unload the main map. Similarly dl_nns isn't supposed to be 0 for static executables anymore, * actual BZ #16046 fix to elf/dl-iteratephdr.c -- the dl_iterate_phdr special function for static executables isn't needed anymore, provided that l_phdr and l_phnum members of the main map have been properly initialized (done in _dl_non_dynamic_init in elf/dl-support.c now), * ld.so.cache loader update to elf/dl-load.c -- GL(dl_ns)[LM_ID_BASE]._ns_loaded is now always initialized in static executables so can become the fallback loader map to check for DF_1_NODEFLIB, provided that the l_flags_1 member of the main map has been properly initialized (done in elf/dl-support.c now); this also ensures previous semantics elsewhere in elf/dl-load.c, * matching updates to elf/dl-support.c -- to complement the two fixes above.
90 lines
2.9 KiB
C
90 lines
2.9 KiB
C
/* Get loaded objects program headers.
|
|
Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Jakub Jelinek <jakub@redhat.com>, 2001.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public License as
|
|
published by the Free Software Foundation; either version 2.1 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <ldsodefs.h>
|
|
#include <stddef.h>
|
|
#include <bits/libc-lock.h>
|
|
|
|
static void
|
|
cancel_handler (void *arg __attribute__((unused)))
|
|
{
|
|
__rtld_lock_unlock_recursive (GL(dl_load_write_lock));
|
|
}
|
|
|
|
hidden_proto (__dl_iterate_phdr)
|
|
int
|
|
__dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
|
|
size_t size, void *data), void *data)
|
|
{
|
|
struct link_map *l;
|
|
struct dl_phdr_info info;
|
|
int ret = 0;
|
|
|
|
/* Make sure nobody modifies the list of loaded objects. */
|
|
__rtld_lock_lock_recursive (GL(dl_load_write_lock));
|
|
__libc_cleanup_push (cancel_handler, NULL);
|
|
|
|
/* We have to determine the namespace of the caller since this determines
|
|
which namespace is reported. */
|
|
size_t nloaded = GL(dl_ns)[0]._ns_nloaded;
|
|
Lmid_t ns = 0;
|
|
#ifdef SHARED
|
|
const void *caller = RETURN_ADDRESS (0);
|
|
for (Lmid_t cnt = GL(dl_nns) - 1; cnt > 0; --cnt)
|
|
for (struct link_map *l = GL(dl_ns)[cnt]._ns_loaded; l; l = l->l_next)
|
|
{
|
|
/* We have to count the total number of loaded objects. */
|
|
nloaded += GL(dl_ns)[cnt]._ns_nloaded;
|
|
|
|
if (caller >= (const void *) l->l_map_start
|
|
&& caller < (const void *) l->l_map_end
|
|
&& (l->l_contiguous
|
|
|| _dl_addr_inside_object (l, (ElfW(Addr)) caller)))
|
|
ns = cnt;
|
|
}
|
|
#endif
|
|
|
|
for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
|
|
{
|
|
info.dlpi_addr = l->l_real->l_addr;
|
|
info.dlpi_name = l->l_real->l_name;
|
|
info.dlpi_phdr = l->l_real->l_phdr;
|
|
info.dlpi_phnum = l->l_real->l_phnum;
|
|
info.dlpi_adds = GL(dl_load_adds);
|
|
info.dlpi_subs = GL(dl_load_adds) - nloaded;
|
|
info.dlpi_tls_data = NULL;
|
|
info.dlpi_tls_modid = l->l_real->l_tls_modid;
|
|
if (info.dlpi_tls_modid != 0)
|
|
info.dlpi_tls_data = GLRO(dl_tls_get_addr_soft) (l->l_real);
|
|
ret = callback (&info, sizeof (struct dl_phdr_info), data);
|
|
if (ret)
|
|
break;
|
|
}
|
|
|
|
/* Release the lock. */
|
|
__libc_cleanup_pop (0);
|
|
__rtld_lock_unlock_recursive (GL(dl_load_write_lock));
|
|
|
|
return ret;
|
|
}
|
|
hidden_def (__dl_iterate_phdr)
|
|
|
|
weak_alias (__dl_iterate_phdr, dl_iterate_phdr);
|