From: "H.J. Lu" <hjl.tools@gmail.com>
To: libc-alpha@sourceware.org
Cc: Florian Weimer <fweimer@redhat.com>,
Adhemerval Zanella <adhemerval.zanella@linaro.org>
Subject: [PATCH v7 3/4] elf: Add a test for PT_LOAD segments with p_align == 1 [BZ #28688]
Date: Mon, 3 Jan 2022 15:04:32 -0800 [thread overview]
Message-ID: <20220103230433.1907240-4-hjl.tools@gmail.com> (raw)
In-Reply-To: <20220103230433.1907240-1-hjl.tools@gmail.com>
Add tst-p_alignmod2-edit to edit the copy of tst-alignmod3.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
diff --git a/elf/Makefile b/elf/Makefile
index 9c831faac1..e4be3fa518 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -406,7 +406,9 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
ifeq (yes,$(build-shared))
tests += \
tst-p_alignmod1-edit \
+ tst-p_alignmod2-edit \
tst-p_align1 \
+ tst-p_align2 \
endif
@@ -2097,3 +2099,14 @@ $(objpfx)tst-p_alignmod1.so: $(objpfx)tst-p_alignmod1-edit \
cp $(objpfx)tst-alignmod3.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-alignmod3.so and update p_align of the first PT_LOAD
+# segment.
+$(objpfx)tst-p_alignmod2.so: $(objpfx)tst-p_alignmod2-edit \
+ $(objpfx)tst-alignmod3.so
+ rm -f $@
+ cp $(objpfx)tst-alignmod3.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..cab9793220
--- /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) 2021 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/>. */
+
+extern int do_load_test (void);
+
+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..2f47b37c9e
--- /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) 2021 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;
+}
--
2.33.1
next prev parent reply other threads:[~2022-01-03 23:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-03 23:04 [PATCH v7 0/4] Properly align all PT_LOAD segments with tests H.J. Lu
2022-01-03 23:04 ` [PATCH v7 1/4] elf: Properly align all PT_LOAD segments [BZ #28676] H.J. Lu
2022-01-18 17:48 ` Adhemerval Zanella
2022-01-18 21:46 ` H.J. Lu
2022-01-03 23:04 ` [PATCH v7 2/4] elf: Add a test for PT_LOAD segments with mixed p_align " H.J. Lu
2022-01-18 16:25 ` Adhemerval Zanella
2022-01-18 21:53 ` H.J. Lu
2022-01-03 23:04 ` H.J. Lu [this message]
2022-01-18 16:32 ` [PATCH v7 3/4] elf: Add a test for PT_LOAD segments with p_align == 1 [BZ #28688] Adhemerval Zanella
2022-01-18 16:36 ` Adhemerval Zanella
2022-01-18 21:55 ` H.J. Lu
2022-01-03 23:04 ` [PATCH v7 4/4] elf: Add a test for PT_LOAD segments with invalid p_align " H.J. Lu
2022-01-18 18:05 ` Adhemerval Zanella
2022-01-18 21:50 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220103230433.1907240-4-hjl.tools@gmail.com \
--to=hjl.tools@gmail.com \
--cc=adhemerval.zanella@linaro.org \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).