mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-18 02:50:09 +00: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.
81 lines
2.6 KiB
C
81 lines
2.6 KiB
C
/* Do relocations for ELF dynamic linking.
|
|
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. */
|
|
|
|
/* This file may be included twice, to define both
|
|
`elf_dynamic_do_rel' and `elf_dynamic_do_rela'. */
|
|
|
|
#ifdef DO_RELA
|
|
# define elf_dynamic_do_rel elf_dynamic_do_rela
|
|
# define Rel Rela
|
|
# define elf_machine_rel elf_machine_rela
|
|
#endif
|
|
|
|
#ifndef VERSYMIDX
|
|
# define VERSYMIDX(sym) (DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (sym))
|
|
#endif
|
|
|
|
/* Perform the relocations in MAP on the running program image as specified
|
|
by RELTAG, SZTAG. If LAZY is nonzero, this is the first pass on PLT
|
|
relocations; they should be set up to call _dl_runtime_resolve, rather
|
|
than fully resolved now. */
|
|
|
|
static inline void
|
|
elf_dynamic_do_rel (struct link_map *map,
|
|
ElfW(Addr) reladdr, ElfW(Addr) relsize,
|
|
int lazy)
|
|
{
|
|
const ElfW(Rel) *r = (const void *) reladdr;
|
|
const ElfW(Rel) *end = (const void *) (reladdr + relsize);
|
|
|
|
if (lazy)
|
|
{
|
|
/* Doing lazy PLT relocations; they need very little info. */
|
|
ElfW(Addr) l_addr = map->l_addr;
|
|
for (; r < end; ++r)
|
|
elf_machine_lazy_rel (l_addr, r);
|
|
}
|
|
else
|
|
{
|
|
const ElfW(Sym) *const symtab =
|
|
(const void *) map->l_info[DT_SYMTAB]->d_un.d_ptr;
|
|
|
|
if (map->l_info[VERSYMIDX (DT_VERSYM)])
|
|
{
|
|
const ElfW(Half) *const version =
|
|
(const void *) map->l_info[VERSYMIDX (DT_VERSYM)]->d_un.d_ptr;
|
|
|
|
for (; r < end; ++r)
|
|
{
|
|
ElfW(Half) ndx = version[ELFW(R_SYM) (r->r_info)];
|
|
elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)],
|
|
&map->l_versions[ndx],
|
|
(void *) (map->l_addr + r->r_offset));
|
|
}
|
|
}
|
|
else
|
|
for (; r < end; ++r)
|
|
elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)], NULL,
|
|
(void *) (map->l_addr + r->r_offset));
|
|
}
|
|
}
|
|
|
|
#undef elf_dynamic_do_rel
|
|
#undef Rel
|
|
#undef elf_machine_rel
|