diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | elf/Makefile | 2 | ||||
| -rw-r--r-- | elf/tst-dl-iter-static.c | 47 |
3 files changed, 52 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 090714d26d..610abcb8e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-06-20 Maciej W. Rozycki <macro@codesourcery.com> + [BZ #16046] + * elf/tst-dl-iter-static.c: New file. + * elf/Makefile (tests-static): Add tst-dl-iter-static. + * stdlib/tst-qsort2.c (main): Fix off-by-one argc interpretation error. diff --git a/elf/Makefile b/elf/Makefile index 6602ed5cf3..25012cc2d8 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -121,7 +121,7 @@ tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1 \ tst-auxv tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static \ tst-leaks1-static tst-array1-static tst-array5-static \ - tst-ptrguard1-static + tst-ptrguard1-static tst-dl-iter-static ifeq (yes,$(build-shared)) tests-static += tst-tls9-static tst-tls9-static-ENV = \ diff --git a/elf/tst-dl-iter-static.c b/elf/tst-dl-iter-static.c new file mode 100644 index 0000000000..7303d7c9fb --- /dev/null +++ b/elf/tst-dl-iter-static.c @@ -0,0 +1,47 @@ +/* BZ #16046 dl_iterate_phdr static executable test. + Copyright (C) 2014 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, see + <http://www.gnu.org/licenses/>. */ + +#include <link.h> + +/* Check that the link map of the static executable itself is iterated + over exactly once. */ + +static int +callback (struct dl_phdr_info *info, size_t size, void *data) +{ + int *count = data; + + if (info->dlpi_name[0] == '\0') + (*count)++; + + return 0; +} + +static int +do_test (void) +{ + int count = 0; + int status; + + status = dl_iterate_phdr (callback, &count); + + return status || count != 1; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |