| |
@@ -0,0 +1,39 @@
|
| |
+ From b26d315640480956ced01ce29d1c8e4be8dd8002 Mon Sep 17 00:00:00 2001
|
| |
+ From: Jeremy Linton <jeremy.linton@arm.com>
|
| |
+ Date: Tue, 13 Oct 2020 13:16:32 -0500
|
| |
+ Subject: [PATCH] rhbz1888842: Short term BTI workaround
|
| |
+
|
| |
+ This patch will skip enabling BTI on systemd services
|
| |
+ with MemoryDenyWriteExecute as the upstream fixes
|
| |
+ will probably take another few weeks to land.
|
| |
+
|
| |
+ Replace this, when it causes a merge conflit (due
|
| |
+ to upstream fixes in this file)
|
| |
+
|
| |
+ Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
|
| |
+ ---
|
| |
+ sysdeps/aarch64/dl-bti.c | 8 ++------
|
| |
+ 1 file changed, 2 insertions(+), 6 deletions(-)
|
| |
+
|
| |
+ diff --git a/sysdeps/aarch64/dl-bti.c b/sysdeps/aarch64/dl-bti.c
|
| |
+ index 196e462520..d580ac581c 100644
|
| |
+ --- a/sysdeps/aarch64/dl-bti.c
|
| |
+ +++ b/sysdeps/aarch64/dl-bti.c
|
| |
+ @@ -40,12 +40,8 @@ enable_bti (struct link_map *map, const char *program)
|
| |
+
|
| |
+ if (__mprotect (start, len, prot) < 0)
|
| |
+ {
|
| |
+ - if (program)
|
| |
+ - _dl_fatal_printf ("%s: mprotect failed to turn on BTI\n",
|
| |
+ - map->l_name);
|
| |
+ - else
|
| |
+ - _dl_signal_error (errno, map->l_name, "dlopen",
|
| |
+ - N_("mprotect failed to turn on BTI"));
|
| |
+ + _dl_printf ("%s: mprotect failed to turn on BTI %d\n",
|
| |
+ + map->l_name, errno);
|
| |
+ }
|
| |
+ }
|
| |
+ return 0;
|
| |
+ --
|
| |
+ 2.28.0
|
| |
+
|
| |
jlinton
commented 3 years ago
This is fedora only patch which works around
BTI related boot/service failures.
Signed-off-by: Jeremy Linton jeremy.linton@arm.com