2001-07-25 20:47:02 +00:00
|
|
|
/* Get loaded objects program headers.
|
2011-09-09 13:43:43 +00:00
|
|
|
Copyright (C) 2001-2004, 2006-2009, 2010, 2011 Free Software Foundation, Inc.
|
2001-07-25 20:47:02 +00:00
|
|
|
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
|
2002-08-26 22:40:48 +00:00
|
|
|
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
|
2001-07-25 20:47:02 +00:00
|
|
|
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
|
2002-08-26 22:40:48 +00:00
|
|
|
Lesser General Public License for more details.
|
2001-07-25 20:47:02 +00:00
|
|
|
|
2002-08-26 22:40:48 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
|
|
not, see <http://www.gnu.org/licenses/>. */
|
2001-07-25 20:47:02 +00:00
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#include <ldsodefs.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <bits/libc-lock.h>
|
|
|
|
|
Update.
2003-09-15 Jakub Jelinek <jakub@redhat.com>
* argp/argp.h (argp_parse, __argp_parse): Remove __THROW.
* argp/Makefile (CFLAGS-argp-help.c, CFLAGS-argp-parse.c): Add
$(uses-callbacks).
* dirent/Makefile (CFLAGS-scandir.c, CFLAGS-scandir64.c): Likewise.
* elf/Makefile (CFLAGS-dl-iterate-phdr.c,
CFLAGS-dl-iterate-phdr-static.c): Add $(uses-callbacks).
* elf/dl-iteratephdr.c (cancel_handler): New function.
(__dl_iterate_phdr): Add __libc_cleanup_{push,pop}.
* elf/link.h (dl_iterate_phdr): Remove __THROW.
* io/Makefile (CFLAGS-fts.c): Merge into one assignment.
Add $(uses-callbacks).
(CFLAGS-ftw.c, CFLAGS-ftw64.c): Add $(uses-callbacks).
* misc/Makefile (CFLAGS-tsearch.c, CFLAGS-lsearch.c): Change
$(exceptions) to $(uses-callbacks).
* Makeconfig (uses-callbacks): Set to $(exceptions).
* posix/Makefile (CFLAGS-glob.c, CFLAGS-glob64.c): Add
$(uses-callbacks).
* stdlib/Makefile (CFLAGS-bsearch.c, CFLAGS-msort.c, CFLAGS-qsort.c):
Likewise.
2003-09-16 05:54:09 +00:00
|
|
|
static void
|
|
|
|
cancel_handler (void *arg __attribute__((unused)))
|
|
|
|
{
|
2010-05-03 15:08:28 +00:00
|
|
|
__rtld_lock_unlock_recursive (GL(dl_load_write_lock));
|
Update.
2003-09-15 Jakub Jelinek <jakub@redhat.com>
* argp/argp.h (argp_parse, __argp_parse): Remove __THROW.
* argp/Makefile (CFLAGS-argp-help.c, CFLAGS-argp-parse.c): Add
$(uses-callbacks).
* dirent/Makefile (CFLAGS-scandir.c, CFLAGS-scandir64.c): Likewise.
* elf/Makefile (CFLAGS-dl-iterate-phdr.c,
CFLAGS-dl-iterate-phdr-static.c): Add $(uses-callbacks).
* elf/dl-iteratephdr.c (cancel_handler): New function.
(__dl_iterate_phdr): Add __libc_cleanup_{push,pop}.
* elf/link.h (dl_iterate_phdr): Remove __THROW.
* io/Makefile (CFLAGS-fts.c): Merge into one assignment.
Add $(uses-callbacks).
(CFLAGS-ftw.c, CFLAGS-ftw64.c): Add $(uses-callbacks).
* misc/Makefile (CFLAGS-tsearch.c, CFLAGS-lsearch.c): Change
$(exceptions) to $(uses-callbacks).
* Makeconfig (uses-callbacks): Set to $(exceptions).
* posix/Makefile (CFLAGS-glob.c, CFLAGS-glob64.c): Add
$(uses-callbacks).
* stdlib/Makefile (CFLAGS-bsearch.c, CFLAGS-msort.c, CFLAGS-qsort.c):
Likewise.
2003-09-16 05:54:09 +00:00
|
|
|
}
|
|
|
|
|
2003-10-22 07:10:00 +00:00
|
|
|
hidden_proto (__dl_iterate_phdr)
|
2001-07-25 20:47:02 +00:00
|
|
|
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;
|
|
|
|
|
2010-05-03 15:08:28 +00:00
|
|
|
/* Make sure nobody modifies the list of loaded objects. */
|
|
|
|
__rtld_lock_lock_recursive (GL(dl_load_write_lock));
|
Update.
2003-09-15 Jakub Jelinek <jakub@redhat.com>
* argp/argp.h (argp_parse, __argp_parse): Remove __THROW.
* argp/Makefile (CFLAGS-argp-help.c, CFLAGS-argp-parse.c): Add
$(uses-callbacks).
* dirent/Makefile (CFLAGS-scandir.c, CFLAGS-scandir64.c): Likewise.
* elf/Makefile (CFLAGS-dl-iterate-phdr.c,
CFLAGS-dl-iterate-phdr-static.c): Add $(uses-callbacks).
* elf/dl-iteratephdr.c (cancel_handler): New function.
(__dl_iterate_phdr): Add __libc_cleanup_{push,pop}.
* elf/link.h (dl_iterate_phdr): Remove __THROW.
* io/Makefile (CFLAGS-fts.c): Merge into one assignment.
Add $(uses-callbacks).
(CFLAGS-ftw.c, CFLAGS-ftw64.c): Add $(uses-callbacks).
* misc/Makefile (CFLAGS-tsearch.c, CFLAGS-lsearch.c): Change
$(exceptions) to $(uses-callbacks).
* Makeconfig (uses-callbacks): Set to $(exceptions).
* posix/Makefile (CFLAGS-glob.c, CFLAGS-glob64.c): Add
$(uses-callbacks).
* stdlib/Makefile (CFLAGS-bsearch.c, CFLAGS-msort.c, CFLAGS-qsort.c):
Likewise.
2003-09-16 05:54:09 +00:00
|
|
|
__libc_cleanup_push (cancel_handler, 0);
|
2001-07-25 20:47:02 +00:00
|
|
|
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
/* 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;
|
2011-11-12 06:49:14 +00:00
|
|
|
#ifdef SHARED
|
|
|
|
const void *caller = RETURN_ADDRESS (0);
|
2009-04-01 00:26:36 +00:00
|
|
|
for (Lmid_t cnt = GL(dl_nns) - 1; cnt > 0; --cnt)
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
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
|
2007-06-19 22:59:48 +00:00
|
|
|
&& caller < (const void *) l->l_map_end
|
|
|
|
&& (l->l_contiguous
|
|
|
|
|| _dl_addr_inside_object (l, (ElfW(Addr)) caller)))
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
ns = cnt;
|
|
|
|
}
|
2011-11-12 06:49:14 +00:00
|
|
|
#endif
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
|
|
|
|
for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
|
2001-07-25 20:47:02 +00:00
|
|
|
{
|
2011-09-09 13:43:43 +00:00
|
|
|
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;
|
2004-01-24 20:12:10 +00:00
|
|
|
info.dlpi_adds = GL(dl_load_adds);
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
info.dlpi_subs = GL(dl_load_adds) - nloaded;
|
2006-03-01 06:18:49 +00:00
|
|
|
info.dlpi_tls_data = NULL;
|
2011-09-09 13:43:43 +00:00
|
|
|
info.dlpi_tls_modid = l->l_real->l_tls_modid;
|
2006-03-01 06:18:49 +00:00
|
|
|
if (info.dlpi_tls_modid != 0)
|
2011-09-09 13:43:43 +00:00
|
|
|
info.dlpi_tls_data = GLRO(dl_tls_get_addr_soft) (l->l_real);
|
2001-07-25 20:47:02 +00:00
|
|
|
ret = callback (&info, sizeof (struct dl_phdr_info), data);
|
|
|
|
if (ret)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Release the lock. */
|
Update.
2003-09-15 Jakub Jelinek <jakub@redhat.com>
* argp/argp.h (argp_parse, __argp_parse): Remove __THROW.
* argp/Makefile (CFLAGS-argp-help.c, CFLAGS-argp-parse.c): Add
$(uses-callbacks).
* dirent/Makefile (CFLAGS-scandir.c, CFLAGS-scandir64.c): Likewise.
* elf/Makefile (CFLAGS-dl-iterate-phdr.c,
CFLAGS-dl-iterate-phdr-static.c): Add $(uses-callbacks).
* elf/dl-iteratephdr.c (cancel_handler): New function.
(__dl_iterate_phdr): Add __libc_cleanup_{push,pop}.
* elf/link.h (dl_iterate_phdr): Remove __THROW.
* io/Makefile (CFLAGS-fts.c): Merge into one assignment.
Add $(uses-callbacks).
(CFLAGS-ftw.c, CFLAGS-ftw64.c): Add $(uses-callbacks).
* misc/Makefile (CFLAGS-tsearch.c, CFLAGS-lsearch.c): Change
$(exceptions) to $(uses-callbacks).
* Makeconfig (uses-callbacks): Set to $(exceptions).
* posix/Makefile (CFLAGS-glob.c, CFLAGS-glob64.c): Add
$(uses-callbacks).
* stdlib/Makefile (CFLAGS-bsearch.c, CFLAGS-msort.c, CFLAGS-qsort.c):
Likewise.
2003-09-16 05:54:09 +00:00
|
|
|
__libc_cleanup_pop (0);
|
2010-05-03 15:08:28 +00:00
|
|
|
__rtld_lock_unlock_recursive (GL(dl_load_write_lock));
|
2001-07-25 20:47:02 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2003-10-22 07:10:00 +00:00
|
|
|
hidden_def (__dl_iterate_phdr)
|
2001-07-25 20:47:02 +00:00
|
|
|
|
|
|
|
#ifdef SHARED
|
2003-10-22 07:10:00 +00:00
|
|
|
|
2001-07-25 20:47:02 +00:00
|
|
|
weak_alias (__dl_iterate_phdr, dl_iterate_phdr);
|
2003-10-22 07:10:00 +00:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
/* dl-support.c defines these and initializes them early on. */
|
|
|
|
extern ElfW(Phdr) *_dl_phdr;
|
|
|
|
extern size_t _dl_phnum;
|
|
|
|
|
|
|
|
int
|
|
|
|
dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
|
|
|
|
size_t size, void *data), void *data)
|
|
|
|
{
|
|
|
|
if (_dl_phnum != 0)
|
|
|
|
{
|
|
|
|
/* This entry describes this statically-linked program itself. */
|
|
|
|
struct dl_phdr_info info;
|
|
|
|
int ret;
|
|
|
|
info.dlpi_addr = 0;
|
|
|
|
info.dlpi_name = "";
|
|
|
|
info.dlpi_phdr = _dl_phdr;
|
|
|
|
info.dlpi_phnum = _dl_phnum;
|
2004-01-24 20:12:10 +00:00
|
|
|
info.dlpi_adds = GL(dl_load_adds);
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
info.dlpi_subs = GL(dl_load_adds) - GL(dl_ns)[LM_ID_BASE]._ns_nloaded;
|
2003-10-22 07:10:00 +00:00
|
|
|
ret = (*callback) (&info, sizeof (struct dl_phdr_info), data);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return __dl_iterate_phdr (callback, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-07-25 20:47:02 +00:00
|
|
|
#endif
|