mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
f420344cef
* elf/dynamic-link.h (elf_get_dynamic_info): Take new argument with load address. Relocate d_ptr in DT_DTRTAB, DT_SYMTAB, DT_RELA, DT_REL, DT_JMPREL, DT_PLTGOT, and DT_VERSYM l_info entry. (_ELF_DYNAMIC_DO_RELOC): Take extra argument which specifies whether rel and rela relocations can both happen and skip one test if this is not possible. (ELF_DYNAMIC_DO_RELA, ELF_DYNAMIC_DO_REL): Call _ELF_DYNAMIC_DO_RELOC appropriately. * elf/dl-addr.c (_dl_addr): DT_SYMTAB and DT_STRTAB entries are already relocated. * elf/dl-deps.c (_dl_map_object_deps): DT_STRTAB entry is already relocated. * elf/dl-load.c (_dl_init_paths): DT_STRTAB entry is already relocated. (_dl_map_object_from_fd): Call elf_get_dynamic_info with new argument. (_dl_map_object): DT_STRTAB entry is already relocated. * elf/dl-lookup.c (do_lookup): DT_STRTAB and DT_SYMTAB entries are already relocated. * elf/dl-reloc.c (_dl_relocate_object): DT_STRTAB entry is already relocated. * elf/dl-runtime.c (fixup): DT_SYMTAB, DT_STRTAB, DT_JMPREL, and DT_VERSYM entries are already relocated. (profile_fixup): Likewise. * elf/dl-version.c: Rename VERSTAG macro into VERSYMIDX. Replace all users. (match_symbol): DT_STRTAB entry is already relocated. (_dl_check_map_versions): Likewise. Also fo DT_VERSYM. * elf/do-rel.h (elf_dynamic_do_rel): reladdr is now assumed to be relocated already. DT_SYMTAB and DT_VERSYM entries are also relocated. * elf/rtld.c (_dl_start): Pass extra argument to elf_get_dynamic_info. (find_needed): DT_STRTAB entry is already relocated. (dl_main): Pass extra argument to elf_get_dynamic_info. DT_STRTAB entry is already relocated. * sysdeps/alpha/dl-machine.h (elf_machine_fixup_plt): DT_JMPREL and DT_PLTGOT entries are already relocated. (elf_machine_rela): Likewise for DT_SYMTAB. * sysdeps/arm/dl-machine.h (elf_machine_rel): DT_STRTAB is already relocated. * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise. * sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Likewise. * sysdeps/mips/dl-machine.h (elf_machine_got_rel): Likewise. (elf_machine_got_rel): Likewise for DT_SYMTAB and DT_STRTAB. * grp/initgroups.c (initgroups): If function in current module was successful don't stop but continue to process to get all the groups.
181 lines
5.8 KiB
C
181 lines
5.8 KiB
C
/* On-demand PLT fixup for shared objects.
|
|
Copyright (C) 1995, 1996, 1997, 1998, 1999 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., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <unistd.h>
|
|
#include <elf/ldsodefs.h>
|
|
#include "dynamic-link.h"
|
|
|
|
#if !defined ELF_MACHINE_NO_RELA || ELF_MACHINE_NO_REL
|
|
# define PLTREL ElfW(Rela)
|
|
#else
|
|
# define PLTREL ElfW(Rel)
|
|
#endif
|
|
|
|
#ifndef VERSYMIDX
|
|
# define VERSYMIDX(sym) (DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (sym))
|
|
#endif
|
|
|
|
|
|
/* 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. */
|
|
|
|
#ifndef ELF_MACHINE_NO_PLT
|
|
static ElfW(Addr) __attribute__ ((unused))
|
|
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 void *) l->l_info[DT_SYMTAB]->d_un.d_ptr;
|
|
const char *strtab = (const void *) l->l_info[DT_STRTAB]->d_un.d_ptr;
|
|
|
|
const PLTREL *const reloc
|
|
= (const void *) (l->l_info[DT_JMPREL]->d_un.d_ptr + reloc_offset);
|
|
const ElfW(Sym) *sym = &symtab[ELFW(R_SYM) (reloc->r_info)];
|
|
void *const rel_addr = (void *)(l->l_addr + reloc->r_offset);
|
|
ElfW(Addr) value;
|
|
|
|
/* Sanity check that we're really looking at a PLT relocation. */
|
|
assert (ELFW(R_TYPE)(reloc->r_info) == ELF_MACHINE_JMP_SLOT);
|
|
|
|
/* Look up the target symbol. */
|
|
switch (l->l_info[VERSYMIDX (DT_VERSYM)] != NULL)
|
|
{
|
|
default:
|
|
{
|
|
const ElfW(Half) *vernum =
|
|
(const void *) l->l_info[VERSYMIDX (DT_VERSYM)]->d_un.d_ptr;
|
|
ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info)];
|
|
const struct r_found_version *version = &l->l_versions[ndx];
|
|
|
|
if (version->hash != 0)
|
|
{
|
|
value = _dl_lookup_versioned_symbol(strtab + sym->st_name,
|
|
&sym, l->l_scope, l->l_name,
|
|
version, ELF_MACHINE_JMP_SLOT);
|
|
break;
|
|
}
|
|
}
|
|
case 0:
|
|
value = _dl_lookup_symbol (strtab + sym->st_name, &sym, l->l_scope,
|
|
l->l_name, ELF_MACHINE_JMP_SLOT);
|
|
}
|
|
|
|
/* Currently value contains the base load address of the object
|
|
that defines sym. Now add in the symbol offset. */
|
|
value = (sym ? value + sym->st_value : 0);
|
|
|
|
/* And now perhaps the relocation addend. */
|
|
value = elf_machine_plt_value (l, reloc, value);
|
|
|
|
/* Finally, fix up the plt itself. */
|
|
elf_machine_fixup_plt (l, reloc, rel_addr, value);
|
|
|
|
return value;
|
|
}
|
|
#endif
|
|
|
|
#if !defined PROF && !defined ELF_MACHINE_NO_PLT
|
|
|
|
static ElfW(Addr) __attribute__ ((unused))
|
|
profile_fixup (
|
|
#ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
|
|
ELF_MACHINE_RUNTIME_FIXUP_ARGS,
|
|
#endif
|
|
struct link_map *l, ElfW(Word) reloc_offset, ElfW(Addr) retaddr)
|
|
{
|
|
void (*mcount_fct) (ElfW(Addr), ElfW(Addr)) = _dl_mcount;
|
|
ElfW(Addr) *resultp;
|
|
ElfW(Addr) value;
|
|
|
|
/* This is the address in the array where we store the result of previous
|
|
relocations. */
|
|
resultp = &l->l_reloc_result[reloc_offset / sizeof (PLTREL)];
|
|
|
|
value = *resultp;
|
|
if (value == 0)
|
|
{
|
|
/* This is the first time we have to relocate this object. */
|
|
const ElfW(Sym) *const symtab
|
|
= (const void *) l->l_info[DT_SYMTAB]->d_un.d_ptr;
|
|
const char *strtab = (const void *) l->l_info[DT_STRTAB]->d_un.d_ptr;
|
|
|
|
const PLTREL *const reloc
|
|
= (const void *) (l->l_info[DT_JMPREL]->d_un.d_ptr + reloc_offset);
|
|
const ElfW(Sym) *sym = &symtab[ELFW(R_SYM) (reloc->r_info)];
|
|
|
|
/* Sanity check that we're really looking at a PLT relocation. */
|
|
assert (ELFW(R_TYPE)(reloc->r_info) == ELF_MACHINE_JMP_SLOT);
|
|
|
|
/* Look up the target symbol. */
|
|
switch (l->l_info[VERSYMIDX (DT_VERSYM)] != NULL)
|
|
{
|
|
default:
|
|
{
|
|
const ElfW(Half) *vernum =
|
|
(const void *) l->l_info[VERSYMIDX (DT_VERSYM)]->d_un.d_ptr;
|
|
ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info)];
|
|
const struct r_found_version *version = &l->l_versions[ndx];
|
|
|
|
if (version->hash != 0)
|
|
{
|
|
value = _dl_lookup_versioned_symbol(strtab + sym->st_name,
|
|
&sym, l->l_scope,
|
|
l->l_name, version,
|
|
ELF_MACHINE_JMP_SLOT);
|
|
break;
|
|
}
|
|
}
|
|
case 0:
|
|
value = _dl_lookup_symbol (strtab + sym->st_name, &sym, l->l_scope,
|
|
l->l_name, ELF_MACHINE_JMP_SLOT);
|
|
}
|
|
|
|
/* Currently value contains the base load address of the object
|
|
that defines sym. Now add in the symbol offset. */
|
|
value = (sym ? value + sym->st_value : 0);
|
|
|
|
/* And now perhaps the relocation addend. */
|
|
value = elf_machine_plt_value (l, reloc, value);
|
|
|
|
/* Store the result for later runs. */
|
|
*resultp = value;
|
|
}
|
|
|
|
(*mcount_fct) (retaddr, value);
|
|
|
|
return value;
|
|
}
|
|
|
|
#endif /* PROF && ELF_MACHINE_NO_PLT */
|
|
|
|
|
|
/* 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
|