AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-08 14:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

elf: Support elf/tst-dlopen-aout in more configurations

Browse Source 
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.)
This commit is contained in:
Florian Weimer 2019-08-12 17:33:29 +02:00
parent c48d92b430
commit 9b9670fcd8
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2019-08-12 Florian Weimer <fweimer@redhat.com>
* elf/Makefile (tests): Unconditionally add tst-dlopen-aout.
[$(build-hardcoded-path-in-tests)] (tst-dlopen-aout-no-pie): Do
not set.
* elf/tst-dlopen-aout.c: Do not included <assert.h>.
(do_test): Open the executable using an absolute path. Print
error message to standard output.
2019-08-09 DJ Delorie <dj@redhat.com>
* elf/dl-tunables.list: Add glibc.malloc.mxfast.

6
elf/Makefile
View File

@ -192,7 +192,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \
tst-latepthread tst-tls-manydynamic tst-nodelete-dlclose \
tst-debug1 tst-main1 tst-absolute-sym tst-absolute-zero tst-big-note \
tst-unwind-ctor tst-unwind-main tst-audit13 \
tst-sonamemove-link tst-sonamemove-dlopen
tst-sonamemove-link tst-sonamemove-dlopen tst-dlopen-aout
# reldep9
tests-internal += loadtest unload unload2 circleload1 \
neededtest neededtest2 neededtest3 neededtest4 \
@ -200,10 +200,6 @@ tests-internal += loadtest unload unload2 circleload1 \
tst-ptrguard1 tst-stackguard1 tst-libc_dlvsym \
tst-create_format1
tests-container += tst-pldd
ifeq ($(build-hardcoded-path-in-tests),yes)
tests += tst-dlopen-aout
tst-dlopen-aout-no-pie = yes
endif
test-srcs = tst-pathopt
selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
ifneq ($(selinux-enabled),1)

21
elf/tst-dlopen-aout.c
View File

@ -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;
}