18447dba2b
It introduces four patches about aligning PT_LOAD segments and update to glibc-2.28-225.0.2.el8. Signed-off-by: Rongwei Wang <rongwei.wang@linux.alibaba.com>
147 lines
4.6 KiB
Diff
147 lines
4.6 KiB
Diff
From 58f93dff514cc0bdf3c72eff590dcf5fe5bf9e00 Mon Sep 17 00:00:00 2001
|
|
From: "H.J. Lu" <hjl.tools@gmail.com>
|
|
Date: Wed, 19 Jul 2023 23:09:09 +0800
|
|
Subject: [PATCH 3/6] Add a testcase to check alignment of PT_LOAD segment [BZ
|
|
#28676]
|
|
|
|
Backport from master commit: fc2334a
|
|
|
|
Signed-off-by: Rongwei Wang <rongwei.wang@linux.alibaba.com>
|
|
---
|
|
elf/Makefile | 13 ++++++++++++-
|
|
elf/tst-align3.c | 38 ++++++++++++++++++++++++++++++++++++++
|
|
elf/tst-alignmod3.c | 32 ++++++++++++++++++++++++++++++++
|
|
3 files changed, 82 insertions(+), 1 deletion(-)
|
|
create mode 100644 elf/tst-align3.c
|
|
create mode 100644 elf/tst-alignmod3.c
|
|
|
|
diff --git a/elf/Makefile b/elf/Makefile
|
|
index 634c3113..442817ca 100644
|
|
--- a/elf/Makefile
|
|
+++ b/elf/Makefile
|
|
@@ -331,6 +331,7 @@ tests += \
|
|
tst-addr1 \
|
|
tst-align \
|
|
tst-align2 \
|
|
+ tst-align3 \
|
|
tst-audit-tlsdesc \
|
|
tst-audit-tlsdesc-dlopen \
|
|
tst-audit1 \
|
|
@@ -466,7 +467,9 @@ endif
|
|
test-srcs = \
|
|
tst-pathopt
|
|
# tests-srcs
|
|
-
|
|
+ifeq (yes,$(have-fpie))
|
|
+tests-pie += tst-align3
|
|
+endif
|
|
selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
|
|
|
|
ifneq ($(selinux-enabled),1)
|
|
@@ -647,6 +650,7 @@ modules-names = \
|
|
tst-absolute-zero-lib \
|
|
tst-alignmod \
|
|
tst-alignmod2 \
|
|
+ tst-alignmod3 \
|
|
tst-array2dep \
|
|
tst-array5dep \
|
|
tst-audit-tlsdesc-mod1 \
|
|
@@ -1669,6 +1673,13 @@ CFLAGS-tst-alignmod2.c += $(stack-align-test-flags)
|
|
$(objpfx)tst-align: $(libdl)
|
|
$(objpfx)tst-align.out: $(objpfx)tst-alignmod.so
|
|
$(objpfx)tst-align2: $(objpfx)tst-alignmod2.so
|
|
+$(objpfx)tst-align3: $(objpfx)tst-alignmod3.so
|
|
+ifeq (yes,$(have-fpie))
|
|
+CFLAGS-tst-align3.c += $(PIE-ccflag)
|
|
+endif
|
|
+LDFLAGS-tst-align3 += -Wl,-z,max-page-size=0x200000
|
|
+LDFLAGS-tst-alignmod3.so += -Wl,-z,max-page-size=0x200000
|
|
+$(objpfx)tst-alignmod3.so: $(libsupport)
|
|
|
|
$(objpfx)unload3: $(libdl)
|
|
$(objpfx)unload3.out: $(objpfx)unload3mod1.so $(objpfx)unload3mod2.so \
|
|
diff --git a/elf/tst-align3.c b/elf/tst-align3.c
|
|
new file mode 100644
|
|
index 00000000..ac86d623
|
|
--- /dev/null
|
|
+++ b/elf/tst-align3.c
|
|
@@ -0,0 +1,38 @@
|
|
+/* Check alignment of PT_LOAD segment 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/>. */
|
|
+
|
|
+#include <support/check.h>
|
|
+#include <tst-stack-align.h>
|
|
+
|
|
+/* This should cover all possible page sizes we currently support. */
|
|
+#define ALIGN 0x200000
|
|
+
|
|
+int bar __attribute__ ((aligned (ALIGN))) = 1;
|
|
+
|
|
+extern int do_load_test (void);
|
|
+
|
|
+static int
|
|
+do_test (void)
|
|
+{
|
|
+ printf ("bar: %p\n", &bar);
|
|
+ TEST_VERIFY (is_aligned (&bar, ALIGN) == 0);
|
|
+
|
|
+ return do_load_test ();
|
|
+}
|
|
+
|
|
+#include <support/test-driver.c>
|
|
diff --git a/elf/tst-alignmod3.c b/elf/tst-alignmod3.c
|
|
new file mode 100644
|
|
index 00000000..0d33f237
|
|
--- /dev/null
|
|
+++ b/elf/tst-alignmod3.c
|
|
@@ -0,0 +1,32 @@
|
|
+/* Check alignment of PT_LOAD segment 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/>. */
|
|
+
|
|
+#include <support/check.h>
|
|
+#include <tst-stack-align.h>
|
|
+
|
|
+/* This should cover all possible page sizes we currently support. */
|
|
+#define ALIGN 0x200000
|
|
+
|
|
+int foo __attribute__ ((aligned (ALIGN))) = 1;
|
|
+
|
|
+void
|
|
+do_load_test (void)
|
|
+{
|
|
+ printf ("foo: %p\n", &foo);
|
|
+ TEST_VERIFY (is_aligned (&foo, ALIGN) == 0);
|
|
+}
|
|
--
|
|
2.27.0
|
|
|