diff options
author | Florian Weimer <fweimer@redhat.com> | 2019-08-12 17:33:29 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2019-08-12 17:59:13 +0200 |
commit | 9b9670fcd8ca92d6f53465e98173e3b33a76182c (patch) | |
tree | e4683cf3c85448b5d418b95af160fea25a55de5a /elf/tst-dlopen-aout.c | |
parent | c48d92b430c480de06762f80c104922239416826 (diff) | |
download | glibc-9b9670fcd8ca92d6f53465e98173e3b33a76182c.tar.gz glibc-9b9670fcd8ca92d6f53465e98173e3b33a76182c.tar.xz glibc-9b9670fcd8ca92d6f53465e98173e3b33a76182c.zip |
elf: Support elf/tst-dlopen-aout in more configurations
dlopen can no longer open PIE binaries, so it is not necessary to link the executable as non-PIE to trigger a dlopen failure. If we hard-code the path to the real executable, we can run the test with and without hard-coded paths because the dlopen path will not be recognized as the main program in both cases. (With an explict loader invocation, the loader currently adds argv[0] to l_libname for the main map and the dlopen call suceeds as a result; it does not do that in standard mode.)
Diffstat (limited to 'elf/tst-dlopen-aout.c')
-rw-r--r-- | elf/tst-dlopen-aout.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/elf/tst-dlopen-aout.c b/elf/tst-dlopen-aout.c index deedd11ad0..25cfe2f740 100644 --- a/elf/tst-dlopen-aout.c +++ b/elf/tst-dlopen-aout.c @@ -18,15 +18,13 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. + <http://www.gnu.org/licenses/>. */ - Note: this test currently only fails when glibc is configured with - --enable-hardcoded-path-in-tests. */ - -#include <assert.h> #include <dlfcn.h> -#include <stdio.h> #include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <support/support.h> #include <support/xthread.h> __thread int x; @@ -42,15 +40,21 @@ do_test (int argc, char *argv[]) { int j; + /* Use the full path so that the dynamic loader does not recognize + the main program as already loaded (even with an explicit ld.so + invocation). */ + char *path = xasprintf ("%s/%s", support_objdir_root, "tst-dlopen-aout"); + printf ("info: dlopen object: %s\n", path); + for (j = 0; j < 100; ++j) { pthread_t thr; void *p; - p = dlopen (argv[0], RTLD_LAZY); + p = dlopen (path, RTLD_LAZY); if (p != NULL) { - fprintf (stderr, "dlopen unexpectedly succeeded\n"); + puts ("error: dlopen succeeded unexpectedly"); return 1; } /* We create threads to force TLS allocation, which triggers @@ -60,6 +64,7 @@ do_test (int argc, char *argv[]) xpthread_join (thr); } + free (path); return 0; } |