lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-11 16:02:46 +03:00
Code Activity

elf: Move __rtld_malloc_init_stubs call into _dl_start_final

Browse Source 
Calling an extern function in a different translation unit before
self-relocation is brittle.  The compiler may load the address
at an earlier point in _dl_start, before self-relocation.  In
_dl_start_final, the call is behind a compiler barrier, so this
cannot happen.
This commit is contained in:
Florian Weimer
2024-09-24 13:23:10 +02:00
parent 9802c0f2fe
commit 2abfa19072
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
elf/rtld.c
View File

@@ -452,6 +452,8 @@ _dl_start_final (void *arg, struct dl_start_final_info *info)
{ {
ElfW(Addr) start_addr; ElfW(Addr) start_addr;
__rtld_malloc_init_stubs ();
/* Do not use an initializer for these members because it would /* Do not use an initializer for these members because it would
interfere with __rtld_static_init. */ interfere with __rtld_static_init. */
GLRO (dl_find_object) = &_dl_find_object; GLRO (dl_find_object) = &_dl_find_object;
@@ -574,8 +576,6 @@ _dl_start (void *arg)
function, that way the compiler cannot put accesses to the GOT function, that way the compiler cannot put accesses to the GOT
before ELF_DYNAMIC_RELOCATE. */ before ELF_DYNAMIC_RELOCATE. */
__rtld_malloc_init_stubs ();
#ifdef DONT_USE_BOOTSTRAP_MAP #ifdef DONT_USE_BOOTSTRAP_MAP
return _dl_start_final (arg); return _dl_start_final (arg);
#else #else