mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
9dcafc5597
* sysdeps/generic/libc-start.c: Don't register program destructor here. * dlfcn/Makefile: Add rules to build dlfcn.c. (LDFLAGS-dl.so): Removed. * dlfcn/dlclose.c: _dl_close is now in ld.so, use function pointer table. * dlfcn/dlmopen.c: Likewise for _dl_open. * dlfcn/dlopen.c: Likewise. * dlfcn/dlopenold.c: Likewise. * elf/dl-libc.c: Likewise for _dl_open and _dl_close. * elf/Makefile (routines): Remove dl-open and dl-close. (dl-routines): Add dl-open, dl-close, and dl-trampoline. Add rules to build and run tst-audit1. * elf/tst-audit1.c: New file. * elf/tst-auditmod1.c: New file. * elf/Versions [libc]: Remove _dl_open and _dl_close. * elf/dl-close.c: Change for use inside ld.so instead of libc.so. * elf/dl-open.c: Likewise. * elf/dl-debug.c (_dl_debug_initialize): Allow reinitialization, signaled by nonzero parameter. * elf/dl-init.c: Fix use of r_state. * elf/dl-load.c: Likewise. * elf/dl-close.c: Add auditing checkpoints. * elf/dl-open.c: Likewise. * elf/dl-fini.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-sym.c: Likewise. * sysdeps/generic/libc-start.c: Likewise. * elf/dl-object.c: Allocate memory for auditing information. * elf/dl-reloc.c: Remove RESOLV. We now always need the map. Correctly initialize slotinfo. * elf/dynamic-link.h: Adjust after removal of RESOLV. * sysdeps/hppa/dl-lookupcfg.h: Likewise. * sysdeps/ia64/dl-lookupcfg.h: Likewise. * sysdeps/powerpc/powerpc64/dl-lookupcfg.h: Removed. * elf/dl-runtime.c (_dl_fixup): Little cleanup. (_dl_profile_fixup): New parameters to point to register struct and variable for frame size. Add auditing checkpoints. (_dl_call_pltexit): New function. Don't define trampoline code here. * elf/rtld.c: Recognize LD_AUDIT. Load modules on startup. Remove all the functions from _rtld_global_ro which only _dl_open and _dl_close needed. Add auditing checkpoints. * elf/link.h: Define symbols for auditing interfaces. * include/link.h: Likewise. * include/dlfcn.h: Define __RTLD_AUDIT. Remove prototypes for _dl_open and _dl_close. Adjust access to argc and argv in libdl. * dlfcn/dlfcn.c: New file. * sysdeps/generic/dl-lookupcfg.h: Remove all content now that RESOLVE is gone. * sysdeps/generic/ldsodefs.h: Add definitions for auditing interfaces. * sysdeps/generic/unsecvars.h: Add LD_AUDIT. * sysdeps/i386/dl-machine.h: Remove trampoline code here. Adjust for removal of RESOLVE. * sysdeps/x86_64/dl-machine.h: Likewise. * sysdeps/generic/dl-trampoline.c: New file. * sysdeps/i386/dl-trampoline.c: New file. * sysdeps/x86_64/dl-trampoline.c: New file. * sysdeps/generic/dl-tls.c: Cleanups. Fixup for dtv_t change. Fix updating of DTV. * sysdeps/generic/libc-tls.c: Likewise. * sysdeps/arm/bits/link.h: Renamed to ... * sysdeps/arm/buts/linkmap.h: ...this. * sysdeps/generic/bits/link.h: Renamed to... * sysdeps/generic/bits/linkmap.h: ...this. * sysdeps/hppa/bits/link.h: Renamed to... * sysdeps/hppa/bits/linkmap.h: ...this. * sysdeps/hppa/i386/link.h: Renamed to... * sysdeps/hppa/i386/linkmap.h: ...this. * sysdeps/hppa/ia64/link.h: Renamed to... * sysdeps/hppa/ia64/linkmap.h: ...this. * sysdeps/hppa/s390/link.h: Renamed to... * sysdeps/hppa/s390/linkmap.h: ...this. * sysdeps/hppa/sh/link.h: Renamed to... * sysdeps/hppa/sh/linkmap.h: ...this. * sysdeps/hppa/x86_64/link.h: Renamed to... * sysdeps/hppa/x86_64/linkmap.h: ...this. 2005-01-06 Ulrich Drepper <drepper@redhat.com> * allocatestack.c (init_one_static_tls): Adjust initialization of DTV entry for static tls deallocation fix. * sysdeps/alpha/tls.h (dtv_t): Change pointer type to be struct which also contains information whether the memory pointed to is static TLS or not. * sysdeps/i386/tls.h: Likewise. * sysdeps/ia64/tls.h: Likewise. * sysdeps/powerpc/tls.h: Likewise. * sysdeps/s390/tls.h: Likewise. * sysdeps/sh/tls.h: Likewise. * sysdeps/sparc/tls.h: Likewise. * sysdeps/x86_64/tls.h: Likewise.
142 lines
4.9 KiB
C
142 lines
4.9 KiB
C
#ifndef _DLFCN_H
|
|
#include <dlfcn/dlfcn.h>
|
|
#include <link.h> /* For ElfW. */
|
|
|
|
/* Internally used flag. */
|
|
#define __RTLD_DLOPEN 0x80000000
|
|
#define __RTLD_SPROF 0x40000000
|
|
#define __RTLD_OPENEXEC 0x20000000
|
|
#define __RTLD_CALLMAP 0x10000000
|
|
#define __RTLD_AUDIT 0x08000000
|
|
|
|
#define __LM_ID_CALLER -2
|
|
|
|
#ifdef SHARED
|
|
/* Locally stored program arguments. */
|
|
extern int __dlfcn_argc attribute_hidden;
|
|
extern char **__dlfcn_argv attribute_hidden;
|
|
#else
|
|
/* These variables are defined and initialized in the startup code. */
|
|
extern int __libc_argc attribute_hidden;
|
|
extern char **__libc_argv attribute_hidden;
|
|
|
|
# define __dlfcn_argc __libc_argc
|
|
# define __dlfcn_argv __libc_argv
|
|
#endif
|
|
|
|
|
|
/* Now define the internal interfaces. */
|
|
|
|
#define __libc_dlopen(name) \
|
|
__libc_dlopen_mode (name, RTLD_LAZY | __RTLD_DLOPEN)
|
|
extern void *__libc_dlopen_mode (__const char *__name, int __mode);
|
|
extern void *__libc_dlsym (void *__map, __const char *__name);
|
|
extern int __libc_dlclose (void *__map);
|
|
libc_hidden_proto (__libc_dlopen_mode)
|
|
libc_hidden_proto (__libc_dlsym)
|
|
libc_hidden_proto (__libc_dlclose)
|
|
|
|
/* Locate shared object containing the given address. */
|
|
#ifdef ElfW
|
|
extern int _dl_addr (const void *address, Dl_info *info,
|
|
struct link_map **mapp, const ElfW(Sym) **symbolp)
|
|
internal_function;
|
|
libc_hidden_proto (_dl_addr)
|
|
#endif
|
|
|
|
/* Close an object previously opened by _dl_open. */
|
|
extern void _dl_close (void *map) attribute_hidden;
|
|
|
|
/* Look up NAME in shared object HANDLE (which may be RTLD_DEFAULT or
|
|
RTLD_NEXT). WHO is the calling function, for RTLD_NEXT. Returns
|
|
the symbol value, which may be NULL. */
|
|
extern void *_dl_sym (void *handle, const char *name, void *who)
|
|
internal_function;
|
|
|
|
/* Look up version VERSION of symbol NAME in shared object HANDLE
|
|
(which may be RTLD_DEFAULT or RTLD_NEXT). WHO is the calling
|
|
function, for RTLD_NEXT. Returns the symbol value, which may be
|
|
NULL. */
|
|
extern void *_dl_vsym (void *handle, const char *name, const char *version,
|
|
void *who)
|
|
internal_function;
|
|
|
|
/* Call OPERATE, catching errors from `dl_signal_error'. If there is no
|
|
error, *ERRSTRING is set to null. If there is an error, *ERRSTRING is
|
|
set to a string constructed from the strings passed to _dl_signal_error,
|
|
and the error code passed is the return value and *OBJNAME is set to
|
|
the object name which experienced the problems. ERRSTRING if nonzero
|
|
points to a malloc'ed string which the caller has to free after use.
|
|
ARGS is passed as argument to OPERATE. */
|
|
extern int _dl_catch_error (const char **objname, const char **errstring,
|
|
void (*operate) (void *),
|
|
void *args)
|
|
internal_function;
|
|
|
|
/* Helper function for <dlfcn.h> functions. Runs the OPERATE function via
|
|
_dl_catch_error. Returns zero for success, nonzero for failure; and
|
|
arranges for `dlerror' to return the error details.
|
|
ARGS is passed as argument to OPERATE. */
|
|
extern int _dlerror_run (void (*operate) (void *), void *args)
|
|
internal_function;
|
|
|
|
#ifdef SHARED
|
|
# define DL_CALLER_DECL /* Nothing */
|
|
# define DL_CALLER RETURN_ADDRESS (0)
|
|
#else
|
|
# define DL_CALLER_DECL , void *dl_caller
|
|
# define DL_CALLER dl_caller
|
|
#endif
|
|
|
|
struct dlfcn_hook
|
|
{
|
|
void *(*dlopen) (const char *file, int mode, void *dl_caller);
|
|
int (*dlclose) (void *handle);
|
|
void *(*dlsym) (void *handle, const char *name, void *dl_caller);
|
|
void *(*dlvsym) (void *handle, const char *name, const char *version,
|
|
void *dl_caller);
|
|
char *(*dlerror) (void);
|
|
int (*dladdr) (const void *address, Dl_info *info);
|
|
int (*dladdr1) (const void *address, Dl_info *info,
|
|
void **extra_info, int flags);
|
|
int (*dlinfo) (void *handle, int request, void *arg, void *dl_caller);
|
|
void *(*dlmopen) (Lmid_t nsid, const char *file, int mode, void *dl_caller);
|
|
void *pad[4];
|
|
};
|
|
|
|
extern struct dlfcn_hook *_dlfcn_hook;
|
|
libdl_hidden_proto (_dlfcn_hook)
|
|
|
|
extern void *__dlopen (const char *file, int mode DL_CALLER_DECL)
|
|
attribute_hidden;
|
|
extern void *__dlmopen (Lmid_t nsid, const char *file, int mode DL_CALLER_DECL)
|
|
attribute_hidden;
|
|
extern int __dlclose (void *handle)
|
|
attribute_hidden;
|
|
extern void *__dlsym (void *handle, const char *name DL_CALLER_DECL)
|
|
attribute_hidden;
|
|
extern void *__dlvsym (void *handle, const char *name, const char *version
|
|
DL_CALLER_DECL)
|
|
attribute_hidden;
|
|
extern char *__dlerror (void)
|
|
attribute_hidden;
|
|
extern int __dladdr (const void *address, Dl_info *info)
|
|
attribute_hidden;
|
|
extern int __dladdr1 (const void *address, Dl_info *info,
|
|
void **extra_info, int flags)
|
|
attribute_hidden;
|
|
extern int __dlinfo (void *handle, int request, void *arg DL_CALLER_DECL)
|
|
attribute_hidden;
|
|
|
|
#ifndef SHARED
|
|
struct link_map;
|
|
extern void * __libc_dlsym_private (struct link_map *map, const char *name)
|
|
attribute_hidden;
|
|
extern void __libc_register_dl_open_hook (struct link_map *map)
|
|
attribute_hidden;
|
|
extern void __libc_register_dlfcn_hook (struct link_map *map)
|
|
attribute_hidden;
|
|
#endif
|
|
|
|
#endif
|