diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 3 | ||||
| -rw-r--r-- | elf/tst-audit2.c | 26 |
2 files changed, 22 insertions, 7 deletions
diff --git a/elf/Makefile b/elf/Makefile index b06e0a7ed2..dedf3c7f50 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1034,7 +1034,8 @@ $(objpfx)tst-dlmopen3.out: $(objpfx)tst-dlmopen1mod.so $(objpfx)tst-audit1.out: $(objpfx)tst-auditmod1.so tst-audit1-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so -$(objpfx)tst-audit2.out: $(objpfx)tst-auditmod1.so +$(objpfx)tst-audit2: $(libdl) +$(objpfx)tst-audit2.out: $(objpfx)tst-auditmod1.so $(objpfx)tst-auditmod9b.so # Prevent GCC-5 from translating a malloc/memset pair into calloc CFLAGS-tst-audit2.c += -fno-builtin tst-audit2-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so diff --git a/elf/tst-audit2.c b/elf/tst-audit2.c index acad1b05cf..1d69cd669e 100644 --- a/elf/tst-audit2.c +++ b/elf/tst-audit2.c @@ -3,26 +3,35 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <dlfcn.h> #define MAGIC1 0xabcdef72 #define MAGIC2 0xd8675309 static __thread unsigned int magic[] = { MAGIC1, MAGIC2 }; +static __thread int calloc_called; #undef calloc /* This calloc definition will be called by the dynamic linker itself. - We test that it has initialized our TLS block by the time it does so. */ + We test that interposed calloc is called by the dynamic loader, and + that TLS is fully initialized by then. */ void * calloc (size_t n, size_t m) { - if (magic[0] != MAGIC1 || magic[1] != MAGIC2) + if (!calloc_called) { - printf ("{%x, %x} != {%x, %x}\n", magic[0], magic[1], MAGIC1, MAGIC2); - abort (); + /* Allow our calloc to be called more than once. */ + calloc_called = 1; + if (magic[0] != MAGIC1 || magic[1] != MAGIC2) + { + printf ("{%x, %x} != {%x, %x}\n", + magic[0], magic[1], MAGIC1, MAGIC2); + abort (); + } + magic[0] = MAGIC2; + magic[1] = MAGIC1; } - magic[0] = MAGIC2; - magic[1] = MAGIC1; n *= m; void *ptr = malloc (n); @@ -34,6 +43,11 @@ calloc (size_t n, size_t m) static int do_test (void) { + /* Make sure that our calloc is called from the dynamic linker at least + once. */ + void *h = dlopen("$ORIGIN/tst-auditmod9b.so", RTLD_LAZY); + if (h != NULL) + dlclose (h); if (magic[1] != MAGIC1 || magic[0] != MAGIC2) { printf ("{%x, %x} != {%x, %x}\n", magic[0], magic[1], MAGIC2, MAGIC1); |