x86/CET: Add a re-exec test with legacy bitmap
Commit Message
Add a re-exec test with legacy bitmap to verify that legacy bitmap is
properly hanlded by kernel.
* sysdeps/x86/Makefile (tests): Add tst-cet-legacy-1a.
($(objpfx)tst-cet-legacy-1a): New target.
* sysdeps/x86/tst-cet-legacy-1a.c: New file.
---
sysdeps/x86/Makefile | 6 ++-
sysdeps/x86/tst-cet-legacy-1a.c | 81 +++++++++++++++++++++++++++++++++
2 files changed, 85 insertions(+), 2 deletions(-)
create mode 100644 sysdeps/x86/tst-cet-legacy-1a.c
Comments
* H. J. Lu:
> +/* Nonzero if the program gets called via `exec'. */
> +static int restart;
> +
> +#define CMDLINE_OPTIONS \
> + { "restart", no_argument, &restart, 1 },
> +
> +extern int do_test (int argc, char *argv[]);
> +
> +#include "../test-skeleton.c"
Please do not use test-skeleton.c for new tests.
> + if (argc != 1 && argc != 4)
> + error (EXIT_FAILURE, 0, "wrong number of arguments (%d)", argc);
error prints to standard error and is therefore not appropriate in
tests.
> +
> + if (argc == 4)
> + execl (argv[0], argv[0], argv[1], argv[2], argv[3], "--direct",
> + "--restart", NULL);
I think you have to add further makefile changes to support
--disable-hardcoded-path-in-tests.
Thanks,
Florian
@@ -18,8 +18,8 @@ ifeq ($(enable-cet),yes)
ifeq ($(subdir),elf)
sysdep-dl-routines += dl-cet
-tests += tst-cet-legacy-1 tst-cet-legacy-2 tst-cet-legacy-2a \
- tst-cet-legacy-3 tst-cet-legacy-4
+tests += tst-cet-legacy-1 tst-cet-legacy-1a tst-cet-legacy-2 \
+ tst-cet-legacy-2a tst-cet-legacy-3 tst-cet-legacy-4
ifneq (no,$(have-tunables))
tests += tst-cet-legacy-4a tst-cet-legacy-4b tst-cet-legacy-4c
endif
@@ -38,6 +38,8 @@ CFLAGS-tst-cet-legacy-mod-4.c += -fcf-protection=none
$(objpfx)tst-cet-legacy-1: $(objpfx)tst-cet-legacy-mod-1.so \
$(objpfx)tst-cet-legacy-mod-2.so
+$(objpfx)tst-cet-legacy-1a: $(objpfx)tst-cet-legacy-mod-1.so \
+ $(objpfx)tst-cet-legacy-mod-2.so
$(objpfx)tst-cet-legacy-2: $(objpfx)tst-cet-legacy-mod-2.so $(libdl)
$(objpfx)tst-cet-legacy-2.out: $(objpfx)tst-cet-legacy-mod-1.so
$(objpfx)tst-cet-legacy-2a: $(objpfx)tst-cet-legacy-mod-2.so $(libdl)
new file mode 100644
@@ -0,0 +1,81 @@
+/* Test for re-exec with legacy bitmap.
+ Copyright (C) 2018 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 <error.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <support/check.h>
+#include <support/support.h>
+
+/* Nonzero if the program gets called via `exec'. */
+static int restart;
+
+#define CMDLINE_OPTIONS \
+ { "restart", no_argument, &restart, 1 },
+
+extern int do_test (int argc, char *argv[]);
+
+#include "../test-skeleton.c"
+
+extern int in_dso_1 (void);
+extern int in_dso_2 (void);
+
+static int
+check (void)
+{
+ if (in_dso_1 () != 0x1234678)
+ {
+ puts ("in_dso_1 () != 0x1234678");
+ exit (1);
+ }
+
+ if (in_dso_2 () != 0xbadbeef)
+ {
+ puts ("in_dso_2 () != 0xbadbeef");
+ exit (1);
+ }
+
+ return 0;
+}
+
+int
+do_test (int argc, char *argv[])
+{
+ /* We must have
+ - one or four parameters left if called initially
+ + path for ld.so optional
+ + "--library-path" optional
+ + the library path optional
+ + the application name
+ */
+
+ if (restart)
+ return check ();
+
+ if (argc != 1 && argc != 4)
+ error (EXIT_FAILURE, 0, "wrong number of arguments (%d)", argc);
+
+ if (argc == 4)
+ execl (argv[0], argv[0], argv[1], argv[2], argv[3], "--direct",
+ "--restart", NULL);
+ else
+ execl (argv[0], argv[0], "--direct", "--restart", NULL);
+
+ return -1;
+}