mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
ba79d61b44
* elf/dl-close.c: New file. * elf/link.h: Declare _dl_close. * elf/Makefile (routines): Add dl-close. * elf/dlclose.c (dlclose): Use _dl_close. * elf/Makefile ($(objpfx)librtld.so): Remove libelf from deps. * elf/dl-runtime.c (_dl_global_scope): New variable. (_dl_object_relocation_scope): New function. (fixup): Use it. * elf/rtld.c (dl_main): Use it. * elf/dl-open.c (_dl_open): Use it. If (MODE & RTLD_GLOBAL), set the l_global bit and append the new map to _dl_global_scope. * elf/link.h: Declare _dl_global_scope, _dl_global_scope_alloc, and _dl_object_relocation_scope. * elf/link.h (struct link_map): Add l_loader member. Remove _dl_map_object_from_fd decl. * elf/dl-load.c (_dl_map_object): Pass LOADER to ... (_dl_map_object_from_fd): Take new arg LOADER and set l_loader member. (_dl_map_object): Try DT_RPATH from all loaders up the chain. * elf/dl-object.c (_dl_loaded): Variable removed. (_dl_default_scope): New variable replaces it. * elf/link.h (_dl_loaded): Remove variable decl; instead define as macro for _dl_default_scope[2]. (_dl_default_scope): Declare it. * sysdeps/i386/dl-machine.h (RTLD_START): Use _dl_default_scope[2] instead of _dl_loaded. * sysdeps/m68k/dl-machine.h (RTLD_START): Likewise. * elf/rtld.c (dl_main): Use _dl_default_scope for symbol lookups. * elf/dl-reloc.c (_dl_relocate_object): Remove check for _dl_rtld_map. * elf/rtld.c (dl_main): Pass 0 for LAZY flag when re-relocating self. * elf/link.h (struct link_map.l_type): Remove lt_interpreter. (struct link_map): Add new flag member l_global. * elf/dl-reloc.c (_dl_relocate_object): Check for _dl_rtld_map directly instead of looking for lt_interpreter. * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise. * elf/rtld.c (_dl_start): Don't bother setting BOOTSTRAP_MAP.l_type. (dl_main): Set _dl_rtld_map.l_type to lt_library. * elf/dl-deps.c (_dl_map_object_deps): Propagate MAP->l_type to dependencies loaded, downgrading lt_executable -> lt_library. * elf/dl-load.c (_dl_map_object_from_fd): Take new arg TYPE and set l_type from that, translating lt_library->lt_executable based on the file's ELF type. (_dl_map_object): Likewise. * elf/link.h: Update prototypes. * elf/dl-open.c: Pass type lt_loaded. * elf/rtld.c: Pass type lt_library. * elf/dl-load.c (_dl_map_object_from_fd): Handle null return from _dl_new_object. (_dl_map_object_from_fd: lose): Unchain and free L if it's not null. Free REALNAME, and just use NAME in error message. * elf/dl-object.c (_dl_new_object): If malloc fails, return null instead of calling _dl_signal_error. * elf/dl-load.c (_dl_map_object_from_fd): Close FD before signalling error for _dl_zerofd setup failure. * elf/dl-object.c (_dl_startup_loaded): Variable removed. * elf/link.h: Remove its decl. * elf/dl-reloc.c (_dl_relocate_object): Take new SCOPE arg and pass it through to _dl_lookup_symbol. * elf/link.h (_dl_relocate_object): Update comment and prototype. * elf/rtld.c (dl_main): Pass scope vector to _dl_relocate_object. * elf/dl-lookup.c (_dl_lookup_symbol): Arg SYMBOL_SCOPE is now a null-terminated vector of pointers, no longer a vector of exactly two. * elf/link.h (_dl_lookup_symbol): Update comment and prototype. * elf/dl-runtime.c (fixup): Set up scope for symbol lookup properly as done in _dl_relocate_object. * elf/dlopen.c: Pass "" to _dl_open when FILE is null.
102 lines
3.1 KiB
C
102 lines
3.1 KiB
C
/* Load the dependencies of a mapped object.
|
|
Copyright (C) 1996 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#include <link.h>
|
|
#include <errno.h>
|
|
#include <dlfcn.h>
|
|
#include <stdlib.h>
|
|
|
|
void
|
|
_dl_map_object_deps (struct link_map *map)
|
|
{
|
|
struct list
|
|
{
|
|
struct link_map *map;
|
|
struct list *next;
|
|
};
|
|
struct list head, *tailp, *scanp;
|
|
unsigned int nlist;
|
|
|
|
/* Start the search list with one element: MAP itself. */
|
|
head.map = map;
|
|
head.next = NULL;
|
|
nlist = 1;
|
|
|
|
|
|
/* Process each element of the search list, loading each of its immediate
|
|
dependencies and appending them to the list as we step through it.
|
|
This produces a flat, ordered list that represents a breadth-first
|
|
search of the dependency tree. */
|
|
for (scanp = tailp = &head; scanp; scanp = scanp->next)
|
|
{
|
|
struct link_map *l = scanp->map;
|
|
|
|
/* We use `l_reserved' as a mark bit to detect objects we have
|
|
already put in the search list and avoid adding duplicate elements
|
|
later in the list. */
|
|
l->l_reserved = 1;
|
|
|
|
if (l->l_info[DT_NEEDED])
|
|
{
|
|
const char *strtab
|
|
= ((void *) l->l_addr + l->l_info[DT_STRTAB]->d_un.d_ptr);
|
|
const ElfW(Dyn) *d;
|
|
for (d = l->l_ld; d->d_tag != DT_NULL; ++d)
|
|
if (d->d_tag == DT_NEEDED)
|
|
{
|
|
/* Map in the needed object. */
|
|
struct link_map *dep
|
|
= _dl_map_object (l, strtab + d->d_un.d_val,
|
|
l->l_type == lt_executable ? lt_library :
|
|
l->l_type);
|
|
|
|
if (dep->l_reserved)
|
|
/* This object is already in the search list we are
|
|
building. Don't add a duplicate pointer. Release the
|
|
reference just added by _dl_map_object. */
|
|
--dep->l_opencount;
|
|
else
|
|
{
|
|
/* Append DEP to the search list. */
|
|
tailp->next = alloca (sizeof *tailp);
|
|
tailp = tailp->next;
|
|
tailp->map = dep;
|
|
tailp->next = NULL;
|
|
++nlist;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Store the search list we built in the object. It will be used for
|
|
searches in the scope of this object. */
|
|
map->l_searchlist = malloc (nlist * sizeof (struct link_map *));
|
|
map->l_nsearchlist = nlist;
|
|
|
|
nlist = 0;
|
|
for (scanp = &head; scanp; scanp = scanp->next)
|
|
{
|
|
map->l_searchlist[nlist++] = scanp->map;
|
|
|
|
/* Now clear all the mark bits we set in the objects on the search list
|
|
to avoid duplicates, so the next call starts fresh. */
|
|
scanp->map->l_reserved = 0;
|
|
}
|
|
}
|