mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
4bae556733
1998-07-08 22:18 Ulrich Drepper <drepper@cygnus.com> * elf/Versions: Add _dl_mcount_wrapper_check. * elf/dlfcn.h (DL_CALL_FCT): Don't test _dl_profile_map, simply use _dl_mcount_wrapper_check. * iconv/skeleton.c: Use DL_CALL_FCT, not _CALL_DL_FCT. * elf/dl-reloc.c (_dl_relocate_object): Don't declare using internal_function. * elf/ldsodefs.h: Likewise. * io/fcntl.h: Define SEEK_SET, SEEK_CUR, and SEEK_END. * libio/stdio.h: Make sure va_list is defined for X/Open. Define P_tmpdir for X/Open. * posix/regex.h: Fix typo. * posix/unistd.h: Define intptr_t if not already happened. Add pthread_atfork prototype. * sysdeps/generic/bits/types.h: Define __intptr_t. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/mips/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/sparc/sparc64/types.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise. * sysdeps/wordsize-32/stdint.h: Don't define intptr_t if already done. * sysdeps/wordsize-64/stdint.h: Likewise. * posix/bits/posix1_lim.h: Define _POSIX_CLOCKRES_MIN. * signal/Makefile (headers): Add bits/sigthread.h. * signal/signal.h: Include bits/sigthread.h. * sysdeps/generic/bits/sigthread.h: New file. * stdlib/stdlib.h: Declare rand_r use __USE_POSIX. * sysdeps/generic/bits/confname.h: Define _PC_FILESIZEBITS. * sysdeps/posix/pathconf.c: Handle _PC_FILESIZEBITS. * sysdeps/unix/sysv/linux/alpha/fpathconf.c: New file. * sysdeps/unix/sysv/linux/alpha/pathconf.c: New file. * sysdeps/generic/bits/dlfcn.h: Define RTLD_LOCAL. * elf/rtld.c: Remove preloading and loadpath variables in SUID programs. * sysdeps/generic/dl-sysdep.c: Define unsetenv. * sysdeps/unix/sysv/linux/i386/dl-librecon.h: Define other envvar names. * sysdeps/unix/sysv/linux/bits/errno.h: Define ECANCELED. * sysdeps/unix/sysv/linux/bits/fcntl.h: Define O_RSYNC and O_DSYNC. Remove O_READ and O_WRITE definition. * sysdeps/unix/sysv/linux/bits/resource.h: Define RLIM_SAVED_MAX and RLIM_SAVED_CUR. * sysdeps/unix/sysv/linux/fstatvfs.h: Handle UFS filesystem. 1998-07-06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules ($(common-objpfx)sysd-versions): Expect awk script in scripts directory. Pass move-if-change to awk. (common-generated): Add $(version-maps) and sysd-versions. * versions.awk: Moved to... * scripts/versions.awk: ... here. Use move-if-change to void touching unchanged files. Print "version-maps = ..." instead of "all-version-maps = ..." and without $(common-objpfx). Explain expected variable names. * Makefile (distribute): Updated. 1998-07-06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * misc/getttyent.c (getttyent): Don't return with locked stream. * misc/mntent_r.c (__getmntent_r): Likewise. 1998-07-07 18:24 Ulrich Drepper <drepper@cygnus.com> * libio/fileops.c (_IO_do_write): Don't shrink wwrite buffer to zero if stream is line buffered. (_io_file_overflow): Likewise. * libio/libio.h (_IO_putc_unlocked): Make sure that for line-buffered streams writing '\n' flushes the string.
116 lines
4.0 KiB
C
116 lines
4.0 KiB
C
/* Relocate a shared object and resolve its references to other loaded objects.
|
|
Copyright (C) 1995, 1996, 1997, 1998 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 <errno.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <elf/ldsodefs.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/types.h>
|
|
#include "dynamic-link.h"
|
|
|
|
|
|
void
|
|
_dl_relocate_object (struct link_map *l, struct link_map *scope[], int lazy,
|
|
int consider_profiling)
|
|
{
|
|
if (l->l_relocated)
|
|
return;
|
|
|
|
if (_dl_debug_reloc)
|
|
_dl_debug_message (1, "\nrelocation processing: ",
|
|
l->l_name[0] ? l->l_name : _dl_argv[0], "\n", NULL);
|
|
|
|
if (l->l_info[DT_TEXTREL])
|
|
{
|
|
/* Bletch. We must make read-only segments writable
|
|
long enough to relocate them. */
|
|
const ElfW(Phdr) *ph;
|
|
for (ph = l->l_phdr; ph < &l->l_phdr[l->l_phnum]; ++ph)
|
|
if (ph->p_type == PT_LOAD && (ph->p_flags & PF_W) == 0)
|
|
{
|
|
caddr_t mapstart = ((caddr_t) l->l_addr +
|
|
(ph->p_vaddr & ~(_dl_pagesize - 1)));
|
|
caddr_t mapend = ((caddr_t) l->l_addr +
|
|
((ph->p_vaddr + ph->p_memsz + _dl_pagesize - 1)
|
|
& ~(_dl_pagesize - 1)));
|
|
if (__mprotect (mapstart, mapend - mapstart,
|
|
PROT_READ|PROT_WRITE) < 0)
|
|
_dl_signal_error (errno, l->l_name,
|
|
"cannot make segment writable for relocation");
|
|
}
|
|
}
|
|
|
|
{
|
|
/* Do the actual relocation of the object's GOT and other data. */
|
|
|
|
const char *strtab /* String table object symbols. */
|
|
= ((void *) l->l_addr + l->l_info[DT_STRTAB]->d_un.d_ptr);
|
|
|
|
/* This macro is used as a callback from the ELF_DYNAMIC_RELOCATE code. */
|
|
#define RESOLVE(ref, version, flags) \
|
|
((version) != NULL && (version)->hash != 0 \
|
|
? _dl_lookup_versioned_symbol (strtab + (*ref)->st_name, (ref), scope, \
|
|
l->l_name, (version), (flags)) \
|
|
: _dl_lookup_symbol (strtab + (*ref)->st_name, (ref), scope, \
|
|
l->l_name, (flags)))
|
|
|
|
#include "dynamic-link.h"
|
|
ELF_DYNAMIC_RELOCATE (l, lazy, consider_profiling);
|
|
|
|
if (_dl_profile != NULL)
|
|
{
|
|
/* Allocate the array which will contain the already found
|
|
relocations. */
|
|
l->l_reloc_result =
|
|
(ElfW(Addr) *) calloc (sizeof (ElfW(Addr)),
|
|
l->l_info[DT_PLTRELSZ]->d_un.d_val);
|
|
if (l->l_reloc_result == NULL)
|
|
_dl_sysdep_fatal (_dl_argv[0] ?: "<program name unknown>",
|
|
"cannot allocate memory for profiling", NULL);
|
|
}
|
|
}
|
|
|
|
/* Mark the object so we know this work has been done. */
|
|
l->l_relocated = 1;
|
|
|
|
if (l->l_info[DT_TEXTREL])
|
|
{
|
|
/* Undo the protection change we made before relocating. */
|
|
const ElfW(Phdr) *ph;
|
|
for (ph = l->l_phdr; ph < &l->l_phdr[l->l_phnum]; ++ph)
|
|
if (ph->p_type == PT_LOAD && (ph->p_flags & PF_W) == 0)
|
|
{
|
|
caddr_t mapstart = ((caddr_t) l->l_addr +
|
|
(ph->p_vaddr & ~(_dl_pagesize - 1)));
|
|
caddr_t mapend = ((caddr_t) l->l_addr +
|
|
((ph->p_vaddr + ph->p_memsz + _dl_pagesize - 1)
|
|
& ~(_dl_pagesize - 1)));
|
|
int prot = 0;
|
|
if (ph->p_flags & PF_R)
|
|
prot |= PROT_READ;
|
|
if (ph->p_flags & PF_X)
|
|
prot |= PROT_EXEC;
|
|
if (__mprotect (mapstart, mapend - mapstart, prot) < 0)
|
|
_dl_signal_error (errno, l->l_name,
|
|
"can't restore segment prot after reloc");
|
|
}
|
|
}
|
|
}
|