mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 06:20:06 +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.
143 lines
4.8 KiB
C
143 lines
4.8 KiB
C
/* On-demand PLT fixup for shared objects.
|
||
Copyright (C) 1995, 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 "dynamic-link.h"
|
||
|
||
|
||
/* The global scope we will use for symbol lookups.
|
||
This will be modified by _dl_open if RTLD_GLOBAL is used. */
|
||
struct link_map **_dl_global_scope = _dl_default_scope;
|
||
struct link_map **_dl_global_scope_end = &_dl_default_scope[3];
|
||
|
||
|
||
/* Hack _dl_global_scope[0] and [1] as necessary, and return a pointer into
|
||
_dl_global_scope that should be passed to _dl_lookup_symbol for symbol
|
||
references made in the object L's relocations. */
|
||
inline struct link_map **
|
||
_dl_object_relocation_scope (struct link_map *l)
|
||
{
|
||
if (l->l_info[DT_SYMBOLIC])
|
||
{
|
||
/* This object's global references are to be resolved first
|
||
in the object itself, and only secondarily in more global
|
||
scopes. */
|
||
|
||
if (! l->l_searchlist)
|
||
/* We must construct the searchlist for this object. */
|
||
_dl_map_object_deps (l);
|
||
|
||
/* The primary scope is this object itself and its
|
||
dependencies. */
|
||
_dl_global_scope[0] = l;
|
||
|
||
/* Secondary is the dependency tree that reached L; the object
|
||
requested directly by the user is at the root of that tree. */
|
||
while (l->l_loader)
|
||
l = l->l_loader;
|
||
_dl_global_scope[1] = l;
|
||
|
||
/* Finally, the global scope follows. */
|
||
|
||
return _dl_global_scope;
|
||
}
|
||
else
|
||
{
|
||
/* Use first the global scope, and then the scope of the root of the
|
||
dependency tree that first caused this object to be loaded. */
|
||
while (l->l_loader)
|
||
l = l->l_loader;
|
||
*_dl_global_scope_end = l;
|
||
return &_dl_global_scope[2];
|
||
}
|
||
}
|
||
|
||
/* Figure out the right type, Rel or Rela. */
|
||
#define elf_machine_rel 1
|
||
#define elf_machine_rela 2
|
||
#if elf_machine_relplt == elf_machine_rel
|
||
#define PLTREL ElfW(Rel)
|
||
#elif elf_machine_relplt == elf_machine_rela
|
||
#define PLTREL ElfW(Rela)
|
||
#else
|
||
#error "dl-machine.h bug: elf_machine_relplt not rel or rela"
|
||
#endif
|
||
#undef elf_machine_rel
|
||
#undef elf_machine_rela
|
||
|
||
/* We need to define the function as a local symbol so that the reference
|
||
in the trampoline code will be a local PC-relative call. Tell the
|
||
compiler not to worry that the function appears not to be called. */
|
||
|
||
static ElfW(Addr) fixup (
|
||
#ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
|
||
ELF_MACHINE_RUNTIME_FIXUP_ARGS,
|
||
#endif
|
||
struct link_map *l, ElfW(Word) reloc_offset)
|
||
__attribute__ ((unused));
|
||
|
||
/* This function is called through a special trampoline from the PLT the
|
||
first time each PLT entry is called. We must perform the relocation
|
||
specified in the PLT of the given shared object, and return the resolved
|
||
function address to the trampoline, which will restart the original call
|
||
to that address. Future calls will bounce directly from the PLT to the
|
||
function. */
|
||
|
||
static ElfW(Addr)
|
||
fixup (
|
||
#ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
|
||
ELF_MACHINE_RUNTIME_FIXUP_ARGS,
|
||
#endif
|
||
struct link_map *l, ElfW(Word) reloc_offset)
|
||
{
|
||
const ElfW(Sym) *const symtab
|
||
= (const ElfW(Sym) *) (l->l_addr + l->l_info[DT_SYMTAB]->d_un.d_ptr);
|
||
const char *strtab =
|
||
(const char *) (l->l_addr + l->l_info[DT_STRTAB]->d_un.d_ptr);
|
||
|
||
const PLTREL *const reloc
|
||
= (const void *) (l->l_addr + l->l_info[DT_JMPREL]->d_un.d_ptr +
|
||
reloc_offset);
|
||
|
||
/* Set up the scope to find symbols referenced by this object. */
|
||
struct link_map **scope = _dl_object_relocation_scope (l);
|
||
|
||
/* Perform the specified relocation. */
|
||
ElfW(Addr) resolve (const ElfW(Sym) **ref,
|
||
ElfW(Addr) reloc_addr, int noplt)
|
||
{
|
||
return _dl_lookup_symbol (strtab + (*ref)->st_name, ref,
|
||
scope, l->l_name, reloc_addr, noplt);
|
||
}
|
||
elf_machine_relplt (l, reloc, &symtab[ELFW(R_SYM) (reloc->r_info)], resolve);
|
||
|
||
*_dl_global_scope_end = NULL;
|
||
|
||
/* Return the address that was written by the relocation. */
|
||
return *(ElfW(Addr) *) (l->l_addr + reloc->r_offset);
|
||
}
|
||
|
||
|
||
/* This macro is defined in dl-machine.h to define the entry point called
|
||
by the PLT. The `fixup' function above does the real work, but a little
|
||
more twiddling is needed to get the stack right and jump to the address
|
||
finally resolved. */
|
||
|
||
ELF_MACHINE_RUNTIME_TRAMPOLINE
|