[2/7] elf: Do not assume symbol order on tst-audit25{a,b}
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
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.
---
elf/tst-audit25.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
elf/tst-audit25a.c | 38 ++++++++++++++++++++++++--------------
elf/tst-audit25b.c | 39 +++++++++++++++++++++++++--------------
3 files changed, 95 insertions(+), 28 deletions(-)
create mode 100644 elf/tst-audit25.h
Comments
If no one opposes it, I will commit this shortly.
On 15/11/22 16:31, Adhemerval Zanella wrote:
> 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.
> ---
> elf/tst-audit25.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
> elf/tst-audit25a.c | 38 ++++++++++++++++++++++++--------------
> elf/tst-audit25b.c | 39 +++++++++++++++++++++++++--------------
> 3 files changed, 95 insertions(+), 28 deletions(-)
> create mode 100644 elf/tst-audit25.h
>
> diff --git a/elf/tst-audit25.h b/elf/tst-audit25.h
> new file mode 100644
> index 0000000000..9b08c43c32
> --- /dev/null
> +++ b/elf/tst-audit25.h
> @@ -0,0 +1,46 @@
> +/* 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;
> +
> + 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;
> + }
> + }
> +
> + 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 c2cff8541b..9d2b316576 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 46391770fd..e1422049b1 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);
> }
new file mode 100644
@@ -0,0 +1,46 @@
+/* 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;
+
+ 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;
+ }
+ }
+
+ for (int i = 0; i < reflen; i++)
+ TEST_COMPARE (found[i], true);
+
+ free (line);
+ fclose (in);
+}
@@ -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);
}
@@ -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);
}