diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-11-10 14:49:33 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-12-12 09:53:20 -0300 |
commit | d4facb63ff0349b3c2a83df7363f23a2dbd64a17 (patch) | |
tree | 9e4a6f2bed3c07bb2435257ac701adb7d009e3e3 | |
parent | 4e21c2075193e406a92c0d1cb091a7c804fda4d9 (diff) | |
download | glibc-d4facb63ff0349b3c2a83df7363f23a2dbd64a17.zip glibc-d4facb63ff0349b3c2a83df7363f23a2dbd64a17.tar.gz glibc-d4facb63ff0349b3c2a83df7363f23a2dbd64a17.tar.bz2 |
elf: Do not assume symbol order on tst-audit25{a,b}
The static linker might impose any order or internal function
position, so change the test to check if the audit prints the
symbol only once in any order.
-rw-r--r-- | elf/tst-audit25.h | 49 | ||||
-rw-r--r-- | elf/tst-audit25a.c | 38 | ||||
-rw-r--r-- | elf/tst-audit25b.c | 39 |
3 files changed, 98 insertions, 28 deletions
diff --git a/elf/tst-audit25.h b/elf/tst-audit25.h new file mode 100644 index 0000000..9011c13 --- /dev/null +++ b/elf/tst-audit25.h @@ -0,0 +1,49 @@ +/* Check LD_AUDIT and LD_BIND_NOW. Common definitions. + Copyright (C) 2022 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 + <https://www.gnu.org/licenses/>. */ + +static void +compare_output (void *buffer, size_t length, const char *ref[], size_t reflen) +{ + FILE *in = fmemopen (buffer, length, "r"); + TEST_VERIFY_EXIT (in != NULL); + char *line = NULL; + size_t linelen = 0; + + bool found[reflen]; + for (int i = 0; i < reflen; i++) + found[i] = false; + + size_t nlines = 0; + while (xgetline (&line, &linelen, in)) + { + for (int i = 0; i < reflen; i++) + if (strcmp (line, ref[i]) == 0) + { + TEST_COMPARE (found[i], false); + found[i] = true; + } + nlines++; + } + + TEST_COMPARE (reflen, nlines); + for (int i = 0; i < reflen; i++) + TEST_COMPARE (found[i], true); + + free (line); + fclose (in); +} diff --git a/elf/tst-audit25a.c b/elf/tst-audit25a.c index c2cff85..9d2b316 100644 --- a/elf/tst-audit25a.c +++ b/elf/tst-audit25a.c @@ -29,6 +29,8 @@ #include <support/support.h> #include <sys/auxv.h> +#include "tst-audit25.h" + static int restart; #define CMDLINE_OPTIONS \ { "restart", no_argument, &restart, 1 }, @@ -82,13 +84,17 @@ do_test (int argc, char *argv[]) /* tst-audit25a is build with -Wl,-z,lazy and tst-audit25mod1 with -Wl,-z,now; so only tst_audit25mod3_func1 should be expected to have LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT. */ - TEST_COMPARE_STRING (result.err.buffer, - "la_symbind: tst_audit25mod3_func1 1\n" - "la_symbind: tst_audit25mod1_func1 0\n" - "la_symbind: tst_audit25mod1_func2 0\n" - "la_symbind: tst_audit25mod2_func1 0\n" - "la_symbind: tst_audit25mod4_func1 0\n" - "la_symbind: tst_audit25mod2_func2 0\n"); + const char *expected[] = + { + "la_symbind: tst_audit25mod1_func1 0\n", + "la_symbind: tst_audit25mod1_func2 0\n", + "la_symbind: tst_audit25mod2_func1 0\n", + "la_symbind: tst_audit25mod2_func2 0\n", + "la_symbind: tst_audit25mod3_func1 1\n", + "la_symbind: tst_audit25mod4_func1 0\n", + }; + compare_output (result.err.buffer, result.err.length, + expected, array_length(expected)); support_capture_subprocess_free (&result); } @@ -103,13 +109,17 @@ do_test (int argc, char *argv[]) /* With LD_BIND_NOW all symbols are expected to have LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT. Also the resolution order is done in breadth-first order. */ - TEST_COMPARE_STRING (result.err.buffer, - "la_symbind: tst_audit25mod4_func1 1\n" - "la_symbind: tst_audit25mod3_func1 1\n" - "la_symbind: tst_audit25mod1_func1 1\n" - "la_symbind: tst_audit25mod2_func1 1\n" - "la_symbind: tst_audit25mod1_func2 1\n" - "la_symbind: tst_audit25mod2_func2 1\n"); + const char *expected[] = + { + "la_symbind: tst_audit25mod1_func1 1\n", + "la_symbind: tst_audit25mod1_func2 1\n", + "la_symbind: tst_audit25mod2_func1 1\n", + "la_symbind: tst_audit25mod2_func2 1\n", + "la_symbind: tst_audit25mod3_func1 1\n", + "la_symbind: tst_audit25mod4_func1 1\n", + }; + compare_output (result.err.buffer, result.err.length, + expected, array_length(expected)); support_capture_subprocess_free (&result); } diff --git a/elf/tst-audit25b.c b/elf/tst-audit25b.c index 4639177..e142204 100644 --- a/elf/tst-audit25b.c +++ b/elf/tst-audit25b.c @@ -16,6 +16,7 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#include <array_length.h> #include <errno.h> #include <getopt.h> #include <limits.h> @@ -28,6 +29,8 @@ #include <support/support.h> #include <sys/auxv.h> +#include "tst-audit25.h" + static int restart; #define CMDLINE_OPTIONS \ { "restart", no_argument, &restart, 1 }, @@ -81,13 +84,17 @@ do_test (int argc, char *argv[]) tst-audit25mod2 is built with -Wl,-z,lazy. So only tst_audit25mod4_func1 (called by tst_audit25mod2_func1) should not have LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT. */ - TEST_COMPARE_STRING (result.err.buffer, - "la_symbind: tst_audit25mod3_func1 1\n" - "la_symbind: tst_audit25mod1_func1 1\n" - "la_symbind: tst_audit25mod2_func1 1\n" - "la_symbind: tst_audit25mod1_func2 1\n" - "la_symbind: tst_audit25mod2_func2 1\n" - "la_symbind: tst_audit25mod4_func1 0\n"); + const char *expected[] = + { + "la_symbind: tst_audit25mod3_func1 1\n", + "la_symbind: tst_audit25mod1_func1 1\n", + "la_symbind: tst_audit25mod2_func1 1\n", + "la_symbind: tst_audit25mod1_func2 1\n", + "la_symbind: tst_audit25mod2_func2 1\n", + "la_symbind: tst_audit25mod4_func1 0\n", + }; + compare_output (result.err.buffer, result.err.length, + expected, array_length(expected)); support_capture_subprocess_free (&result); } @@ -102,13 +109,17 @@ do_test (int argc, char *argv[]) /* With LD_BIND_NOW all symbols are expected to have LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT. Also the resolution order is done in breadth-first order. */ - TEST_COMPARE_STRING (result.err.buffer, - "la_symbind: tst_audit25mod4_func1 1\n" - "la_symbind: tst_audit25mod3_func1 1\n" - "la_symbind: tst_audit25mod1_func1 1\n" - "la_symbind: tst_audit25mod2_func1 1\n" - "la_symbind: tst_audit25mod1_func2 1\n" - "la_symbind: tst_audit25mod2_func2 1\n"); + const char *expected[] = + { + "la_symbind: tst_audit25mod4_func1 1\n", + "la_symbind: tst_audit25mod3_func1 1\n", + "la_symbind: tst_audit25mod1_func1 1\n", + "la_symbind: tst_audit25mod2_func1 1\n", + "la_symbind: tst_audit25mod1_func2 1\n", + "la_symbind: tst_audit25mod2_func2 1\n", + }; + compare_output (result.err.buffer, result.err.length, + expected, array_length(expected)); support_capture_subprocess_free (&result); } |