diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 2 | ||||
| -rw-r--r-- | elf/Versions | 2 | ||||
| -rw-r--r-- | elf/dl-open.c | 4 | ||||
| -rw-r--r-- | elf/dlopen.c | 7 | ||||
| -rw-r--r-- | elf/dlopenold.c | 59 |
5 files changed, 71 insertions, 3 deletions
diff --git a/elf/Makefile b/elf/Makefile index ddd9d222fb..763908e7c5 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -42,7 +42,7 @@ distribute = $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \ extra-libs = libdl extra-libs-others = $(extra-libs) -libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr +libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr dlopenold before-compile = $(objpfx)trusted-dirs.h diff --git a/elf/Versions b/elf/Versions index c8bea74545..ff01d78a10 100644 --- a/elf/Versions +++ b/elf/Versions @@ -32,6 +32,6 @@ libdl { dladdr; dlclose; dlerror; dlopen; dlsym; } GLIBC_2.1 { - dlvsym; + dlopen; dlvsym; } } diff --git a/elf/dl-open.c b/elf/dl-open.c index 9bbbee80f7..8cf1084a94 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -154,6 +154,10 @@ _dl_open (const char *file, int mode) char *errstring; int errcode; + if ((mode & RTLD_BINDING_MASK) == 0) + /* One of the flags must be set. */ + _dl_signal_error (EINVAL, file, _("invalid mode for dlopen()")); + /* Make sure we are alone. */ __libc_lock_lock (_dl_load_lock); diff --git a/elf/dlopen.c b/elf/dlopen.c index d616e489f2..496fc7d386 100644 --- a/elf/dlopen.c +++ b/elf/dlopen.c @@ -41,7 +41,7 @@ dlopen_doit (void *a) void * -dlopen (const char *file, int mode) +__dlopen_check (const char *file, int mode) { struct dlopen_args args; args.file = file; @@ -49,3 +49,8 @@ dlopen (const char *file, int mode) return _dlerror_run (dlopen_doit, &args) ? NULL : args.new; } +#if defined PIC && defined DO_VERSIONING +default_symbol_version (__dlopen_check, dlopen, GLIBC_2.1); +#else +weak_alias (__dlopen_check, dlopen) +#endif diff --git a/elf/dlopenold.c b/elf/dlopenold.c new file mode 100644 index 0000000000..a9659ae3ec --- /dev/null +++ b/elf/dlopenold.c @@ -0,0 +1,59 @@ +/* Load a shared object at run time. + 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. */ + +#ifdef PIC + +#include <dlfcn.h> +#include <stddef.h> +#include <elf/ldsodefs.h> + +struct dlopen_args +{ + /* The arguments for dlopen_doit. */ + const char *file; + int mode; + /* The return value of dlopen_doit. */ + struct link_map *new; +}; + + +static void +dlopen_doit (void *a) +{ + struct dlopen_args *args = (struct dlopen_args *) a; + + args->new = _dl_open (args->file ?: "", args->mode); +} + + +void * +__dlopen_nocheck (const char *file, int mode) +{ + struct dlopen_args args; + args.file = file; + + if ((mode & RTLD_BINDING_MASK) == 0) + /* By default assume RTLD_LAZY. */ + mode |= RTLD_LAZY; + args.mode = mode; + + return _dlerror_run (dlopen_doit, &args) ? NULL : args.new; +} +symbol_version (__dlopen_nocheck, dlopen, GLIBC_2.0); +#endif |