mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-27 04:41:02 +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>
188 lines
5.1 KiB
C
188 lines
5.1 KiB
C
/* Storage management for the chain of loaded shared objects.
|
|
Copyright (C) 1995-2002, 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 <errno.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <ldsodefs.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
/* Allocate a `struct link_map' for a new object being loaded,
|
|
and enter it into the _dl_loaded list. */
|
|
|
|
struct link_map *
|
|
internal_function
|
|
_dl_new_object (char *realname, const char *libname, int type,
|
|
struct link_map *loader, int mode, Lmid_t nsid)
|
|
{
|
|
struct link_map *l;
|
|
int idx;
|
|
size_t libname_len = strlen (libname) + 1;
|
|
struct link_map *new;
|
|
struct libname_list *newname;
|
|
|
|
new = (struct link_map *) calloc (sizeof (*new) + sizeof (*newname)
|
|
+ libname_len, 1);
|
|
if (new == NULL)
|
|
return NULL;
|
|
|
|
new->l_real = new;
|
|
new->l_libname = newname = (struct libname_list *) (new + 1);
|
|
newname->name = (char *) memcpy (newname + 1, libname, libname_len);
|
|
/* newname->next = NULL; We use calloc therefore not necessary. */
|
|
newname->dont_free = 1;
|
|
|
|
new->l_name = realname;
|
|
new->l_type = type;
|
|
new->l_loader = loader;
|
|
#if defined USE_TLS && NO_TLS_OFFSET != 0
|
|
new->l_tls_offset = NO_TLS_OFFSET;
|
|
#endif
|
|
new->l_ns = nsid;
|
|
|
|
/* new->l_global = 0; We use calloc therefore not necessary. */
|
|
|
|
/* Use the 'l_scope_mem' array by default for the the 'l_scope'
|
|
information. If we need more entries we will allocate a large
|
|
array dynamically. */
|
|
new->l_scope = new->l_scope_mem;
|
|
new->l_scope_max = sizeof (new->l_scope_mem) / sizeof (new->l_scope_mem[0]);
|
|
|
|
/* Counter for the scopes we have to handle. */
|
|
idx = 0;
|
|
|
|
if (GL(dl_ns)[nsid]._ns_loaded != NULL)
|
|
{
|
|
l = GL(dl_ns)[nsid]._ns_loaded;
|
|
while (l->l_next != NULL)
|
|
l = l->l_next;
|
|
new->l_prev = l;
|
|
/* new->l_next = NULL; Would be necessary but we use calloc. */
|
|
l->l_next = new;
|
|
|
|
/* Add the global scope. */
|
|
new->l_scope[idx++] = &GL(dl_ns)[nsid]._ns_loaded->l_searchlist;
|
|
}
|
|
else
|
|
GL(dl_ns)[nsid]._ns_loaded = new;
|
|
++GL(dl_ns)[nsid]._ns_nloaded;
|
|
++GL(dl_load_adds);
|
|
|
|
/* If we have no loader the new object acts as it. */
|
|
if (loader == NULL)
|
|
loader = new;
|
|
else
|
|
/* Determine the local scope. */
|
|
while (loader->l_loader != NULL)
|
|
loader = loader->l_loader;
|
|
|
|
/* Insert the scope if it isn't the global scope we already added. */
|
|
if (idx == 0 || &loader->l_searchlist != new->l_scope[0])
|
|
{
|
|
if ((mode & RTLD_DEEPBIND) != 0 && idx != 0)
|
|
{
|
|
new->l_scope[1] = new->l_scope[0];
|
|
idx = 0;
|
|
}
|
|
|
|
new->l_scope[idx] = &loader->l_searchlist;
|
|
}
|
|
|
|
new->l_local_scope[0] = &new->l_searchlist;
|
|
|
|
/* Don't try to find the origin for the main map which has the name "". */
|
|
if (realname[0] != '\0')
|
|
{
|
|
size_t realname_len = strlen (realname) + 1;
|
|
char *origin;
|
|
char *cp;
|
|
|
|
if (realname[0] == '/')
|
|
{
|
|
/* It is an absolute path. Use it. But we have to make a
|
|
copy since we strip out the trailing slash. */
|
|
cp = origin = (char *) malloc (realname_len);
|
|
if (origin == NULL)
|
|
{
|
|
origin = (char *) -1;
|
|
goto out;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
size_t len = realname_len;
|
|
char *result = NULL;
|
|
|
|
/* Get the current directory name. */
|
|
origin = NULL;
|
|
do
|
|
{
|
|
char *new_origin;
|
|
|
|
len += 128;
|
|
new_origin = (char *) realloc (origin, len);
|
|
if (new_origin == NULL)
|
|
/* We exit the loop. Note that result == NULL. */
|
|
break;
|
|
origin = new_origin;
|
|
}
|
|
while ((result = __getcwd (origin, len - realname_len)) == NULL
|
|
&& errno == ERANGE);
|
|
|
|
if (result == NULL)
|
|
{
|
|
/* We were not able to determine the current directory.
|
|
Note that free(origin) is OK if origin == NULL. */
|
|
free (origin);
|
|
origin = (char *) -1;
|
|
goto out;
|
|
}
|
|
|
|
/* Find the end of the path and see whether we have to add a
|
|
slash. We could use rawmemchr but this need not be
|
|
fast. */
|
|
cp = (strchr) (origin, '\0');
|
|
if (cp[-1] != '/')
|
|
*cp++ = '/';
|
|
}
|
|
|
|
/* Add the real file name. */
|
|
cp = __mempcpy (cp, realname, realname_len);
|
|
|
|
/* Now remove the filename and the slash. Leave the slash if
|
|
the name is something like "/foo". */
|
|
do
|
|
--cp;
|
|
while (*cp != '/');
|
|
|
|
if (cp == origin)
|
|
/* Keep the only slash which is the first character. */
|
|
++cp;
|
|
*cp = '\0';
|
|
|
|
out:
|
|
new->l_origin = origin;
|
|
}
|
|
|
|
return new;
|
|
}
|