-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* dlfcn/Makefile (tests): Add tst-dlinfo. ($(objpfx)tst-dlinfo): New target. * dlfcn/dlinfo.c: New file. * dlfcn/Makefile (libdl-routines): Add it. * dlfcn/Versions (libdl: GLIBC_2.3.3): Add dlinfo. * dlfcn/dlfcn.h [__USE_GNU]: Declare dlinfo. [__USE_GNU] (RTLD_DI_*): New enum constants. [__USE_GNU] (Dl_serpath, Dl_serinfo): New types. * elf/dl-load.c (cache_rpath): New inline function. (_dl_map_object): Use it. (_dl_rtld_di_serinfo): New function. * sysdeps/generic/ldsodefs.h: Declare it. * elf/Versions (ld: GLIBC_PRIVATE): Add it.
- Loading branch information
Roland McGrath
committed
Mar 15, 2003
1 parent
124dcac
commit 45e4762
Showing
10 changed files
with
396 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,6 @@ libdl { | |
| dlopen; dlvsym; | ||
| } | ||
| GLIBC_2.3.3 { | ||
| dladdr1; | ||
| dladdr1; dlinfo; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* dlinfo -- Get information from the dynamic linker. | ||
| Copyright (C) 2003 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 Lesser General Public | ||
| License as published by the Free Software Foundation; either | ||
| version 2.1 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 | ||
| Lesser General Public License for more details. | ||
| You should have received a copy of the GNU Lesser General Public | ||
| License along with the GNU C Library; if not, write to the Free | ||
| Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA | ||
| 02111-1307 USA. */ | ||
|
|
||
| #include <dlfcn.h> | ||
| #include <link.h> | ||
| #include <ldsodefs.h> | ||
| #include <libintl.h> | ||
|
|
||
| struct dlinfo_args | ||
| { | ||
| ElfW(Addr) caller; | ||
| void *handle; | ||
| int request; | ||
| void *arg; | ||
| }; | ||
|
|
||
| static void | ||
| dlinfo_doit (void *argsblock) | ||
| { | ||
| struct dlinfo_args *const args = argsblock; | ||
| struct link_map *l = args->handle; | ||
|
|
||
| #if 0 | ||
| if (args->handle == RTLD_SELF) | ||
| { | ||
|
|
||
| /* Find the highest-addressed object that CALLER is not below. */ | ||
| for (l = GL(dl_loaded); l != NULL; l = l->l_next) | ||
| if (caller >= l->l_map_start && caller < l->l_map_end) | ||
| /* There must be exactly one DSO for the range of the virtual | ||
| memory. Otherwise something is really broken. */ | ||
| break; | ||
|
|
||
| if (l == NULL) | ||
| _dl_signal_error (0, NULL, NULL, N_("\ | ||
| RTLD_SELF used in code not dynamically loaded")); | ||
| } | ||
| #endif | ||
|
|
||
| switch (args->request) | ||
| { | ||
| case RTLD_DI_LMID: | ||
| case RTLD_DI_CONFIGADDR: | ||
| default: | ||
| _dl_signal_error (0, NULL, NULL, N_("unsupported dlinfo request")); | ||
| break; | ||
|
|
||
| case RTLD_DI_LINKMAP: | ||
| *(struct link_map **) args->arg = l; | ||
| break; | ||
|
|
||
| case RTLD_DI_SERINFO: | ||
| _dl_rtld_di_serinfo (l, args->arg, false); | ||
| break; | ||
| case RTLD_DI_SERINFOSIZE: | ||
| _dl_rtld_di_serinfo (l, args->arg, true); | ||
| break; | ||
|
|
||
| case RTLD_DI_ORIGIN: | ||
| strcpy (args->arg, l->l_origin); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| int | ||
| dlinfo (void *handle, int request, void *arg) | ||
| { | ||
| struct dlinfo_args args = { (ElfW(Addr)) RETURN_ADDRESS (0), | ||
| handle, request, arg }; | ||
| return _dlerror_run (&dlinfo_doit, &args) ? -1 : 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* Test for dlinfo. | ||
| Copyright (C) 2003 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 Lesser General Public | ||
| License as published by the Free Software Foundation; either | ||
| version 2.1 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 | ||
| Lesser General Public License for more details. | ||
| You should have received a copy of the GNU Lesser General Public | ||
| License along with the GNU C Library; if not, write to the Free | ||
| Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA | ||
| 02111-1307 USA. */ | ||
|
|
||
| #include <dlfcn.h> | ||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
| #include <error.h> | ||
|
|
||
| #define TEST_FUNCTION do_test () | ||
|
|
||
| static int | ||
| do_test (void) | ||
| { | ||
| int status = 0; | ||
|
|
||
| void *handle = dlopen ("glreflib1.so", RTLD_NOW); | ||
| if (handle == NULL) | ||
| error (EXIT_FAILURE, 0, "cannot load: glreflib1.so: %s", dlerror ()); | ||
|
|
||
| #define TRY(req, arg) \ | ||
| if (dlinfo (handle, req, arg) != 0) \ | ||
| { \ | ||
| printf ("dlinfo failed for %s: %s\n", #req, dlerror ()); \ | ||
| status = 1; \ | ||
| } \ | ||
| else | ||
|
|
||
| struct link_map *l; | ||
| TRY (RTLD_DI_LINKMAP, &l) | ||
| { | ||
| if (l != handle) | ||
| { | ||
| printf ("bogus link_map? %p != %p\n", l, handle); | ||
| status = 1; | ||
| } | ||
| } | ||
|
|
||
| char origin[8192]; /* >= PATH_MAX, in theory */ | ||
| TRY (RTLD_DI_ORIGIN, origin) | ||
| { | ||
| printf ("origin: %s\n", origin); | ||
| } | ||
|
|
||
| Dl_serinfo counts; | ||
| TRY (RTLD_DI_SERINFOSIZE, &counts) | ||
| { | ||
| Dl_serinfo *buf = alloca (counts.dls_size); | ||
| buf->dls_cnt = counts.dls_cnt; | ||
| buf->dls_size = counts.dls_size; | ||
| printf ("%u library directories\n", buf->dls_cnt); | ||
| TRY (RTLD_DI_SERINFO, buf) | ||
| { | ||
| if (counts.dls_cnt != buf->dls_cnt) | ||
| { | ||
| printf ("??? became %u library directories\n", buf->dls_cnt); | ||
| status = 1; | ||
| } | ||
| for (unsigned int i = 0; i < buf->dls_cnt; ++i) | ||
| printf ("\t%#02x\t%s\n", | ||
| buf->dls_serpath[i].dls_flags, | ||
| buf->dls_serpath[i].dls_name); | ||
| } | ||
| } | ||
|
|
||
| unsigned long int lmid = 0xdeadbeefUL; | ||
| if (dlinfo (handle, RTLD_DI_LMID, &lmid) != 0) | ||
| printf ("dlinfo refuses RTLD_DI_LMID: %s\n", dlerror ()); | ||
| else | ||
| { | ||
| printf ("dlinfo RTLD_DI_LMID worked? %#lx\n", lmid); | ||
| status = lmid == 0xdeadbeefUL; | ||
| } | ||
|
|
||
| #undef TRY | ||
| dlclose (handle); | ||
|
|
||
| return status; | ||
| } | ||
|
|
||
| #include "../test-skeleton.c" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.