d5144c30f4
details: - elf: Handle static PIE with non-zero load address - elf: Introduce _dl_relocate_object_no_relro - elf: Switch to main malloc after final ld.so self-relocation
90 lines
2.8 KiB
Diff
90 lines
2.8 KiB
Diff
From f2326c2ec0a0a8db7bc7f4db8cce3002768fc3b6 Mon Sep 17 00:00:00 2001
|
|
From: Florian Weimer <fweimer@redhat.com>
|
|
Date: Wed, 6 Nov 2024 10:33:44 +0100
|
|
Subject: [PATCH] elf: Introduce _dl_relocate_object_no_relro
|
|
|
|
And make _dl_protect_relro apply RELRO conditionally.
|
|
|
|
Reviewed-by: DJ Delorie <dj@redhat.com>
|
|
---
|
|
elf/dl-reloc.c | 24 ++++++++++++++----------
|
|
sysdeps/generic/ldsodefs.h | 7 +++++++
|
|
2 files changed, 21 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
|
|
index 1d558c1e..84bdddb2 100644
|
|
--- a/elf/dl-reloc.c
|
|
+++ b/elf/dl-reloc.c
|
|
@@ -202,8 +202,8 @@ 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)
|
|
{
|
|
struct textrels
|
|
{
|
|
@@ -242,9 +242,6 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
|
|
# define consider_symbind 0
|
|
#endif
|
|
|
|
- if (l->l_relocated)
|
|
- return;
|
|
-
|
|
/* If DT_BIND_NOW is set relocate all references in this object. We
|
|
do not do this if we are profiling, of course. */
|
|
// XXX Correct for auditing?
|
|
@@ -342,17 +339,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 e8b7359b..94b32151 100644
|
|
--- a/sysdeps/generic/ldsodefs.h
|
|
+++ b/sysdeps/generic/ldsodefs.h
|
|
@@ -1012,6 +1012,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;
|
|
|
|
--
|
|
2.27.0
|
|
|