53f4d259fa
Upstream commit: fffc2df8a3e2c8cda2991063d23086360268b777 - i386: Provide GLIBC_ABI_GNU_TLS symbol version [BZ #33221] - i386: Update ___tls_get_addr to preserve vector registers - Extend struct r_debug to support multiple namespaces (RHEL-101985) - Fix a potential crash in the dynamic loader when processing specific symbol versions (RHEL-109683) - Signal la_objopen for ld.so with dlmopen (RHEL-109693) - Switch to main malloc after final ld.so self-relocation (RHEL-109703) - Prevent ld.so from asserting and crashing during audited library loads (RHEL-109702) - x86-64: Provide GLIBC_ABI_DT_X86_64_PLT symbol version (RHEL-109621) - x86-64, i386: Provide GLIBC_ABI_GNU2_TLS symbol version (RHEL-109625) - Ensure fallback initialization of ctype TLS data pointers to fix segfaults in programs using dlmopen or auditors (RHEL-72018) - Handle load segment gaps in _dl_find_object (RHEL-104854) - AArch64: Improve codegen in SVE log1p - AArch64: Optimize inverse trig functions - AArch64: Avoid memset ifunc in cpu-features.c [BZ #33112] Resolves: RHEL-109536 Resolves: RHEL-72018 Resolves: RHEL-101985 Resolves: RHEL-104854 Resolves: RHEL-109621 Resolves: RHEL-109625 Resolves: RHEL-109683 Resolves: RHEL-109693 Resolves: RHEL-109702 Resolves: RHEL-109703
79 lines
2.4 KiB
Diff
79 lines
2.4 KiB
Diff
commit 65d86471cee80144aee1829b191cd23dd9683497
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Wed Nov 6 10:33:44 2024 +0100
|
|
|
|
elf: Introduce _dl_relocate_object_no_relro
|
|
|
|
And make _dl_protect_relro apply RELRO conditionally.
|
|
|
|
Reviewed-by: DJ Delorie <dj@redhat.com>
|
|
(cherry picked from commit f2326c2ec0a0a8db7bc7f4db8cce3002768fc3b6)
|
|
|
|
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
|
|
index b2c1627ceb847486..76d14830ddda83b7 100644
|
|
--- a/elf/dl-reloc.c
|
|
+++ b/elf/dl-reloc.c
|
|
@@ -202,12 +202,9 @@ resolve_map (lookup_t l, struct r_scope_elem *scope[], const ElfW(Sym) **ref,
|
|
#include "dynamic-link.h"
|
|
|
|
void
|
|
-_dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
|
|
- int reloc_mode, int consider_profiling)
|
|
+_dl_relocate_object_no_relro (struct link_map *l, struct r_scope_elem *scope[],
|
|
+ int reloc_mode, int consider_profiling)
|
|
{
|
|
- if (l->l_relocated)
|
|
- return;
|
|
-
|
|
struct textrels
|
|
{
|
|
caddr_t start;
|
|
@@ -338,17 +335,24 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
|
|
|
|
textrels = textrels->next;
|
|
}
|
|
-
|
|
- /* In case we can protect the data now that the relocations are
|
|
- done, do it. */
|
|
- if (l->l_relro_size != 0)
|
|
- _dl_protect_relro (l);
|
|
}
|
|
|
|
+void
|
|
+_dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
|
|
+ int reloc_mode, int consider_profiling)
|
|
+{
|
|
+ if (l->l_relocated)
|
|
+ return;
|
|
+ _dl_relocate_object_no_relro (l, scope, reloc_mode, consider_profiling);
|
|
+ _dl_protect_relro (l);
|
|
+}
|
|
|
|
void
|
|
_dl_protect_relro (struct link_map *l)
|
|
{
|
|
+ if (l->l_relro_size == 0)
|
|
+ return;
|
|
+
|
|
ElfW(Addr) start = ALIGN_DOWN((l->l_addr
|
|
+ l->l_relro_addr),
|
|
GLRO(dl_pagesize));
|
|
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
|
|
index 259ce2e7d6e8ff31..91447a5e77c2466d 100644
|
|
--- a/sysdeps/generic/ldsodefs.h
|
|
+++ b/sysdeps/generic/ldsodefs.h
|
|
@@ -1014,6 +1014,13 @@ extern void _dl_relocate_object (struct link_map *map,
|
|
int reloc_mode, int consider_profiling)
|
|
attribute_hidden;
|
|
|
|
+/* Perform relocation, but do not apply RELRO. Does not check
|
|
+ L->relocated. Otherwise the same as _dl_relocate_object. */
|
|
+void _dl_relocate_object_no_relro (struct link_map *map,
|
|
+ struct r_scope_elem *scope[],
|
|
+ int reloc_mode, int consider_profiling)
|
|
+ attribute_hidden;
|
|
+
|
|
/* Protect PT_GNU_RELRO area. */
|
|
extern void _dl_protect_relro (struct link_map *map) attribute_hidden;
|
|
|