summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2021-09-23 09:06:49 -0700
committerH.J. Lu <hjl.tools@gmail.com>2021-10-19 06:40:38 -0700
commit2ec99d8c42b2ff1a1231e4df462a0910a9b7fdef (patch)
treeb67493baf7fcb5c424a1e77e79c8e7b1f9a1ca5d /elf
parent1d550265a75b412cea4889a50b101395f6a8e025 (diff)
downloadglibc-2ec99d8c42b2ff1a1231e4df462a0910a9b7fdef.tar.gz
glibc-2ec99d8c42b2ff1a1231e4df462a0910a9b7fdef.tar.xz
glibc-2ec99d8c42b2ff1a1231e4df462a0910a9b7fdef.zip
ld.so: Initialize bootstrap_map.l_ld_readonly [BZ #28340]
1. Define DL_RO_DYN_SECTION to initalize bootstrap_map.l_ld_readonly
before calling elf_get_dynamic_info to get dynamic info in bootstrap_map,
2. Define a single

static inline bool
dl_relocate_ld (const struct link_map *l)
{
  /* Don't relocate dynamic section if it is readonly  */
  return !(l->l_ld_readonly || DL_RO_DYN_SECTION);
}

This updates BZ #28340 fix.
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index c66a1d00bc..b8ba2d8836 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -547,6 +547,7 @@ _dl_start (void *arg)
 
   /* Read our own dynamic section and fill in the info array.  */
   bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic ();
+  bootstrap_map.l_ld_readonly = DL_RO_DYN_SECTION;
   elf_get_dynamic_info (&bootstrap_map, true, false);
 
 #if NO_TLS_OFFSET != 0