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.
258 lines
8.5 KiB
C
258 lines
8.5 KiB
C
/* Machine-dependent ELF dynamic relocation inline functions. i386 version.
|
|
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. */
|
|
|
|
#define ELF_MACHINE_NAME "i386"
|
|
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
#include <link.h>
|
|
|
|
|
|
/* Return nonzero iff E_MACHINE is compatible with the running host. */
|
|
static inline int
|
|
elf_machine_matches_host (Elf32_Half e_machine)
|
|
{
|
|
switch (e_machine)
|
|
{
|
|
case EM_386:
|
|
case EM_486:
|
|
return 1;
|
|
default:
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
/* Return the run-time address of the _GLOBAL_OFFSET_TABLE_.
|
|
Must be inlined in a function which uses global data. */
|
|
static inline Elf32_Addr *
|
|
elf_machine_got (void)
|
|
{
|
|
register Elf32_Addr *got asm ("%ebx");
|
|
return got;
|
|
}
|
|
|
|
|
|
/* Return the run-time load address of the shared object. */
|
|
static inline Elf32_Addr
|
|
elf_machine_load_address (void)
|
|
{
|
|
Elf32_Addr addr;
|
|
asm (" call here\n"
|
|
"here: popl %0\n"
|
|
" subl $here, %0"
|
|
: "=r" (addr));
|
|
return addr;
|
|
}
|
|
/* The `subl' insn above will contain an R_386_32 relocation entry
|
|
intended to insert the run-time address of the label `here'.
|
|
This will be the first relocation in the text of the dynamic linker;
|
|
we skip it to avoid trying to modify read-only text in this early stage. */
|
|
#define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info) \
|
|
++(const Elf32_Rel *) (dynamic_info)[DT_REL]->d_un.d_ptr; \
|
|
(dynamic_info)[DT_RELSZ]->d_un.d_val -= sizeof (Elf32_Rel);
|
|
|
|
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
MAP is the object containing the reloc. */
|
|
|
|
static inline void
|
|
elf_machine_rel (struct link_map *map,
|
|
const Elf32_Rel *reloc, const Elf32_Sym *sym,
|
|
Elf32_Addr (*resolve) (const Elf32_Sym **ref,
|
|
Elf32_Addr reloc_addr,
|
|
int noplt))
|
|
{
|
|
Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset);
|
|
Elf32_Addr loadbase;
|
|
|
|
switch (ELF32_R_TYPE (reloc->r_info))
|
|
{
|
|
case R_386_COPY:
|
|
loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0);
|
|
memcpy (reloc_addr, (void *) (loadbase + sym->st_value), sym->st_size);
|
|
break;
|
|
case R_386_GLOB_DAT:
|
|
loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0) :
|
|
/* RESOLVE is null during bootstrap relocation. */
|
|
map->l_addr);
|
|
*reloc_addr = sym ? (loadbase + sym->st_value) : 0;
|
|
break;
|
|
case R_386_JMP_SLOT:
|
|
loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 1) :
|
|
/* RESOLVE is null during bootstrap relocation. */
|
|
map->l_addr);
|
|
*reloc_addr = sym ? (loadbase + sym->st_value) : 0;
|
|
break;
|
|
case R_386_32:
|
|
if (resolve && map == &_dl_rtld_map)
|
|
{
|
|
/* Undo the relocation done here during bootstrapping. Now we will
|
|
relocate it anew, possibly using a binding found in the user
|
|
program or a loaded library rather than the dynamic linker's
|
|
built-in definitions used while loading those libraries. */
|
|
const Elf32_Sym *const dlsymtab
|
|
= (void *) (map->l_addr + map->l_info[DT_SYMTAB]->d_un.d_ptr);
|
|
*reloc_addr -= (map->l_addr +
|
|
dlsymtab[ELF32_R_SYM (reloc->r_info)].st_value);
|
|
}
|
|
loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0) :
|
|
/* RESOLVE is null during bootstrap relocation. */
|
|
map->l_addr);
|
|
*reloc_addr += sym ? (loadbase + sym->st_value) : 0;
|
|
break;
|
|
case R_386_RELATIVE:
|
|
if (!resolve || map != &_dl_rtld_map) /* Already done in rtld itself. */
|
|
*reloc_addr += map->l_addr;
|
|
break;
|
|
case R_386_PC32:
|
|
loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0) :
|
|
/* RESOLVE is null during bootstrap relocation. */
|
|
map->l_addr);
|
|
*reloc_addr += ((sym ? (loadbase + sym->st_value) : 0) -
|
|
(Elf32_Addr) reloc_addr);
|
|
break;
|
|
case R_386_NONE: /* Alright, Wilbur. */
|
|
break;
|
|
default:
|
|
assert (! "unexpected dynamic reloc type");
|
|
break;
|
|
}
|
|
}
|
|
|
|
static inline void
|
|
elf_machine_lazy_rel (struct link_map *map, const Elf32_Rel *reloc)
|
|
{
|
|
Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset);
|
|
switch (ELF32_R_TYPE (reloc->r_info))
|
|
{
|
|
case R_386_JMP_SLOT:
|
|
*reloc_addr += map->l_addr;
|
|
break;
|
|
default:
|
|
assert (! "unexpected PLT reloc type");
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Nonzero iff TYPE describes relocation of a PLT entry, so
|
|
PLT entries should not be allowed to define the value. */
|
|
#define elf_machine_pltrel_p(type) ((type) == R_386_JMP_SLOT)
|
|
|
|
/* The i386 never uses Elf32_Rela relocations. */
|
|
#define ELF_MACHINE_NO_RELA 1
|
|
|
|
|
|
/* Set up the loaded object described by L so its unrelocated PLT
|
|
entries will jump to the on-demand fixup code in dl-runtime.c. */
|
|
|
|
static inline void
|
|
elf_machine_runtime_setup (struct link_map *l, int lazy)
|
|
{
|
|
Elf32_Addr *got;
|
|
extern void _dl_runtime_resolve (Elf32_Word);
|
|
|
|
if (l->l_info[DT_JMPREL] && lazy)
|
|
{
|
|
/* The GOT entries for functions in the PLT have not yet been filled
|
|
in. Their initial contents will arrange when called to push an
|
|
offset into the .rel.plt section, push _GLOBAL_OFFSET_TABLE_[1],
|
|
and then jump to _GLOBAL_OFFSET_TABLE[2]. */
|
|
got = (Elf32_Addr *) (l->l_addr + l->l_info[DT_PLTGOT]->d_un.d_ptr);
|
|
got[1] = (Elf32_Addr) l; /* Identify this shared object. */
|
|
/* This function will get called to fix up the GOT entry indicated by
|
|
the offset on the stack, and then jump to the resolved address. */
|
|
got[2] = (Elf32_Addr) &_dl_runtime_resolve;
|
|
}
|
|
|
|
/* This code is used in dl-runtime.c to call the `fixup' function
|
|
and then redirect to the address it returns. */
|
|
#define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
|
|
.globl _dl_runtime_resolve
|
|
.type _dl_runtime_resolve, @function
|
|
_dl_runtime_resolve:
|
|
call fixup # Args pushed by PLT.
|
|
addl $8, %esp # Pop args.
|
|
jmp *%eax # Jump to function address.
|
|
");
|
|
/* The PLT uses Elf32_Rel relocs. */
|
|
#define elf_machine_relplt elf_machine_rel
|
|
}
|
|
|
|
/* Mask identifying addresses reserved for the user program,
|
|
where the dynamic linker should not map anything. */
|
|
#define ELF_MACHINE_USER_ADDRESS_MASK 0xf8000000UL
|
|
|
|
|
|
|
|
/* Initial entry point code for the dynamic linker.
|
|
The C function `_dl_start' is the real entry point;
|
|
its return value is the user program's entry point. */
|
|
|
|
#define RTLD_START asm ("\
|
|
.text\n\
|
|
.globl _start\n\
|
|
.globl _dl_start_user\n\
|
|
_start:\n\
|
|
call _dl_start\n\
|
|
_dl_start_user:\n\
|
|
# Save the user entry point address in %edi.\n\
|
|
movl %eax, %edi\n\
|
|
# Point %ebx at the GOT.
|
|
call 0f\n\
|
|
0: popl %ebx\n\
|
|
addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx\n\
|
|
# See if we were run as a command with the executable file\n\
|
|
# name as an extra leading argument.\n\
|
|
movl _dl_skip_args@GOT(%ebx), %eax\n\
|
|
movl (%eax),%eax\n\
|
|
# Pop the original argument count.\n\
|
|
popl %ecx\n\
|
|
# Subtract _dl_skip_args from it.\n\
|
|
subl %eax, %ecx\n\
|
|
# Adjust the stack pointer to skip _dl_skip_args words.\n\
|
|
leal (%esp,%eax,4), %esp\n\
|
|
# Push back the modified argument count.\n\
|
|
pushl %ecx\n\
|
|
# Push _dl_default_scope[2] as argument in _dl_init_next call below.\n\
|
|
movl _dl_default_scope@GOT(%ebx), %eax\n\
|
|
movl 8(%eax), %esi\n\
|
|
0: pushl %esi\n\
|
|
# Call _dl_init_next to return the address of an initializer\n\
|
|
# function to run.\n\
|
|
call _dl_init_next@PLT\n\
|
|
addl $4, %esp # Pop argument.\n\
|
|
# Check for zero return, when out of initializers.\n\
|
|
testl %eax,%eax\n\
|
|
jz 1f\n\
|
|
# Call the shared object initializer function.\n\
|
|
# NOTE: We depend only on the registers (%ebx, %esi and %edi)\n\
|
|
# and the return address pushed by this call;\n\
|
|
# the initializer is called with the stack just\n\
|
|
# as it appears on entry, and it is free to move\n\
|
|
# the stack around, as long as it winds up jumping to\n\
|
|
# the return address on the top of the stack.\n\
|
|
call *%eax\n\
|
|
# Loop to call _dl_init_next for the next initializer.\n\
|
|
jmp 0b\n\
|
|
1: # Pass our finalizer function to the user in %edx, as per ELF ABI.\n\
|
|
movl _dl_fini@GOT(%ebx), %edx\n\
|
|
# Jump to the user's entry point.\n\
|
|
jmp *%edi\n\
|
|
");
|