mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
c0f62c5678
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>
88 lines
2.7 KiB
C
88 lines
2.7 KiB
C
/* Check whether caller comes from the right place.
|
|
Copyright (C) 2004 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
|
|
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; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <assert.h>
|
|
#include <ldsodefs.h>
|
|
#include <stddef.h>
|
|
#include <caller.h>
|
|
#include <gnu/lib-names.h>
|
|
|
|
|
|
int
|
|
attribute_hidden
|
|
_dl_check_caller (const void *caller, enum allowmask mask)
|
|
{
|
|
static const char expected1[] = LIBC_SO;
|
|
static const char expected2[] = LIBDL_SO;
|
|
#ifdef LIBPTHREAD_SO
|
|
static const char expected3[] = LIBPTHREAD_SO;
|
|
#endif
|
|
static const char expected4[] = LD_SO;
|
|
|
|
for (Lmid_t ns = 0; ns < DL_NNS; ++ns)
|
|
for (struct link_map *l = GL(dl_ns)[ns]._ns_loaded; l != NULL;
|
|
l = l->l_next)
|
|
if (caller >= (const void *) l->l_map_start
|
|
&& caller < (const void *) l->l_text_end)
|
|
{
|
|
/* The address falls into this DSO's address range. Check the
|
|
name. */
|
|
if ((mask & allow_libc) && strcmp (expected1, l->l_name) == 0)
|
|
return 0;
|
|
if ((mask & allow_libdl) && strcmp (expected2, l->l_name) == 0)
|
|
return 0;
|
|
#ifdef LIBPTHREAD_SO
|
|
if ((mask & allow_libpthread) && strcmp (expected3, l->l_name) == 0)
|
|
return 0;
|
|
#endif
|
|
if ((mask & allow_ldso) && strcmp (expected4, l->l_name) == 0)
|
|
return 0;
|
|
|
|
struct libname_list *runp = l->l_libname;
|
|
|
|
while (runp != NULL)
|
|
{
|
|
if ((mask & allow_libc) && strcmp (expected1, runp->name) == 0)
|
|
return 0;
|
|
if ((mask & allow_libdl) && strcmp (expected2, runp->name) == 0)
|
|
return 0;
|
|
#ifdef LIBPTHREAD_SO
|
|
if ((mask & allow_libpthread)
|
|
&& strcmp (expected3, runp->name) == 0)
|
|
return 0;
|
|
#endif
|
|
if ((mask & allow_ldso) && strcmp (expected4, runp->name) == 0)
|
|
return 0;
|
|
|
|
runp = runp->next;
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
/* Maybe the dynamic linker is not yet on the list. */
|
|
if ((mask & allow_ldso) != 0
|
|
&& caller >= (const void *) GL(dl_rtld_map).l_map_start
|
|
&& caller < (const void *) GL(dl_rtld_map).l_text_end)
|
|
return 0;
|
|
|
|
/* No valid caller. */
|
|
return 1;
|
|
}
|