mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

elf: Introduce _dl_relocate_object_no_relro

Browse Source 
And make _dl_protect_relro apply RELRO conditionally.

Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Florian Weimer 2024-11-06 10:33:44 +01:00
parent a796422045
commit f2326c2ec0
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
elf/dl-reloc.c
View File

@ -202,12 +202,9 @@ resolve_map (lookup_t l, struct r_scope_elem *scope[], const ElfW(Sym) **ref,
#include "dynamic-link.h" #include "dynamic-link.h"
void void
_dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], _dl_relocate_object_no_relro (struct link_map *l, struct r_scope_elem *scope[],
int reloc_mode, int consider_profiling) int reloc_mode, int consider_profiling)
{ {
if (l->l_relocated)
return;
struct textrels struct textrels
{ {
caddr_t start; caddr_t start;
@ -338,17 +335,24 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
textrels = textrels->next; 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 void
_dl_protect_relro (struct link_map *l) _dl_protect_relro (struct link_map *l)
{ {
if (l->l_relro_size == 0)
return;
ElfW(Addr) start = ALIGN_DOWN((l->l_addr ElfW(Addr) start = ALIGN_DOWN((l->l_addr
+ l->l_relro_addr), + l->l_relro_addr),
GLRO(dl_pagesize)); GLRO(dl_pagesize));

7
sysdeps/generic/ldsodefs.h
View File

@ -1014,6 +1014,13 @@ extern void _dl_relocate_object (struct link_map *map,
int reloc_mode, int consider_profiling) int reloc_mode, int consider_profiling)
attribute_hidden; 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. */ /* Protect PT_GNU_RELRO area. */
extern void _dl_protect_relro (struct link_map *map) attribute_hidden; extern void _dl_protect_relro (struct link_map *map) attribute_hidden;