diff mbox series

[v9,2/3] elf: Add a test for PT_LOAD segments with p_align == 1 [BZ #28688]

Message ID 20220121211205.268178-3-hjl.tools@gmail.com
State Committed
Headers show
Series Add p_align tests for PT_LOAD segments | expand

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

H.J. Lu Jan. 21, 2022, 9:12 p.m. UTC
Add tst-p_alignmod2-edit to edit the copy of tst-p_alignmod-base.so to
set p_align of the first PT_LOAD segment to 1 and verify that the shared
library can be loaded normally.
---
 elf/Makefile               | 13 +++++++++++++
 elf/tst-p_align2.c         | 27 +++++++++++++++++++++++++++
 elf/tst-p_alignmod2-edit.c | 27 +++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 elf/tst-p_align2.c
 create mode 100644 elf/tst-p_alignmod2-edit.c

Comments

Adhemerval Zanella Jan. 24, 2022, 2:16 p.m. UTC | #1
On 21/01/2022 18:12, H.J. Lu wrote:
> Add tst-p_alignmod2-edit to edit the copy of tst-p_alignmod-base.so to
> set p_align of the first PT_LOAD segment to 1 and verify that the shared
> library can be loaded normally.

LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  elf/Makefile               | 13 +++++++++++++
>  elf/tst-p_align2.c         | 27 +++++++++++++++++++++++++++
>  elf/tst-p_alignmod2-edit.c | 27 +++++++++++++++++++++++++++
>  3 files changed, 67 insertions(+)
>  create mode 100644 elf/tst-p_align2.c
>  create mode 100644 elf/tst-p_alignmod2-edit.c
> 
> diff --git a/elf/Makefile b/elf/Makefile
> index cdb41c686e..c63abab44b 100644
> --- a/elf/Makefile
> +++ b/elf/Makefile
> @@ -413,7 +413,9 @@ tests += \
>    tst-noload \
>    tst-null-argv \
>    tst-p_alignmod1-edit \
> +  tst-p_alignmod2-edit \
>    tst-p_align1 \
> +  tst-p_align2 \
>    tst-relsort1 \
>    tst-ro-dynamic \
>    tst-rtld-run-static \
> @@ -2595,3 +2597,14 @@ $(objpfx)tst-p_alignmod1.so: $(objpfx)tst-p_alignmod1-edit \
>  	cp $(objpfx)tst-p_alignmod-base.so $@
>  	$(test-wrapper-env) $(run-program-env) $(rtld-prefix) \
>  	  $(objpfx)tst-p_alignmod1-edit $@
> +
> +$(objpfx)tst-p_align2: $(objpfx)tst-p_alignmod2.so
> +
> +# Make a copy of tst-p_alignmod-base.so and update p_align of the first
> +# PT_LOAD segment.
> +$(objpfx)tst-p_alignmod2.so: $(objpfx)tst-p_alignmod2-edit \
> +			     $(objpfx)tst-p_alignmod-base.so
> +	rm -f $@
> +	cp $(objpfx)tst-p_alignmod-base.so $@
> +	$(test-wrapper-env) $(run-program-env) $(rtld-prefix) \
> +	  $(objpfx)tst-p_alignmod2-edit $@
> diff --git a/elf/tst-p_align2.c b/elf/tst-p_align2.c
> new file mode 100644
> index 0000000000..961c7fbbf1
> --- /dev/null
> +++ b/elf/tst-p_align2.c
> @@ -0,0 +1,27 @@
> +/* Check different alignments of PT_LOAD segments in a shared library.
> +   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/>.  */
> +
> +#include "tst-p_align.h"
> +
> +static int
> +do_test (void)
> +{
> +  return do_load_test ();
> +}
> +
> +#include <support/test-driver.c>
> diff --git a/elf/tst-p_alignmod2-edit.c b/elf/tst-p_alignmod2-edit.c
> new file mode 100644
> index 0000000000..4c2ae65b4e
> --- /dev/null
> +++ b/elf/tst-p_alignmod2-edit.c
> @@ -0,0 +1,27 @@
> +/* Set p_align of the first PT_LOAD segment to 1.
> +   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/>.  */
> +
> +#include "tst-elf-edit.h"
> +
> +/* Set p_align to 1.  */
> +
> +static size_t
> +update_p_align (size_t p_align __attribute__ ((unused)))
> +{
> +  return 1;
> +}
diff mbox series

Patch

diff --git a/elf/Makefile b/elf/Makefile
index cdb41c686e..c63abab44b 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -413,7 +413,9 @@  tests += \
   tst-noload \
   tst-null-argv \
   tst-p_alignmod1-edit \
+  tst-p_alignmod2-edit \
   tst-p_align1 \
+  tst-p_align2 \
   tst-relsort1 \
   tst-ro-dynamic \
   tst-rtld-run-static \
@@ -2595,3 +2597,14 @@  $(objpfx)tst-p_alignmod1.so: $(objpfx)tst-p_alignmod1-edit \
 	cp $(objpfx)tst-p_alignmod-base.so $@
 	$(test-wrapper-env) $(run-program-env) $(rtld-prefix) \
 	  $(objpfx)tst-p_alignmod1-edit $@
+
+$(objpfx)tst-p_align2: $(objpfx)tst-p_alignmod2.so
+
+# Make a copy of tst-p_alignmod-base.so and update p_align of the first
+# PT_LOAD segment.
+$(objpfx)tst-p_alignmod2.so: $(objpfx)tst-p_alignmod2-edit \
+			     $(objpfx)tst-p_alignmod-base.so
+	rm -f $@
+	cp $(objpfx)tst-p_alignmod-base.so $@
+	$(test-wrapper-env) $(run-program-env) $(rtld-prefix) \
+	  $(objpfx)tst-p_alignmod2-edit $@
diff --git a/elf/tst-p_align2.c b/elf/tst-p_align2.c
new file mode 100644
index 0000000000..961c7fbbf1
--- /dev/null
+++ b/elf/tst-p_align2.c
@@ -0,0 +1,27 @@ 
+/* Check different alignments of PT_LOAD segments in a shared library.
+   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/>.  */
+
+#include "tst-p_align.h"
+
+static int
+do_test (void)
+{
+  return do_load_test ();
+}
+
+#include <support/test-driver.c>
diff --git a/elf/tst-p_alignmod2-edit.c b/elf/tst-p_alignmod2-edit.c
new file mode 100644
index 0000000000..4c2ae65b4e
--- /dev/null
+++ b/elf/tst-p_alignmod2-edit.c
@@ -0,0 +1,27 @@ 
+/* Set p_align of the first PT_LOAD segment to 1.
+   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/>.  */
+
+#include "tst-elf-edit.h"
+
+/* Set p_align to 1.  */
+
+static size_t
+update_p_align (size_t p_align __attribute__ ((unused)))
+{
+  return 1;
+}