You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
117 lines
3.7 KiB
117 lines
3.7 KiB
commit 5f36e5c70107ecb59281ef57f9f1c0e37ec3076d |
|
Author: H.J. Lu <hjl.tools@gmail.com> |
|
Date: Thu Sep 23 09:06:49 2021 -0700 |
|
|
|
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. |
|
|
|
(cherry picked from commit 2ec99d8c42b2ff1a1231e4df462a0910a9b7fdef) |
|
|
|
diff --git a/elf/rtld.c b/elf/rtld.c |
|
index 405166d62b34847c..d83ac1bdc40a6081 100644 |
|
--- a/elf/rtld.c |
|
+++ b/elf/rtld.c |
|
@@ -548,6 +548,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); |
|
|
|
#if NO_TLS_OFFSET != 0 |
|
diff --git a/sysdeps/generic/dl-relocate-ld.h b/sysdeps/generic/dl-relocate-ld.h |
|
index 5fae206db9941e97..cfb86c2d6a2394c1 100644 |
|
--- a/sysdeps/generic/dl-relocate-ld.h |
|
+++ b/sysdeps/generic/dl-relocate-ld.h |
|
@@ -19,14 +19,7 @@ |
|
#ifndef _DL_RELOCATE_LD_H |
|
#define _DL_RELOCATE_LD_H |
|
|
|
-/* Return true if dynamic section in the shared library L should be |
|
- relocated. */ |
|
- |
|
-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; |
|
-} |
|
+/* The dynamic section is writable. */ |
|
+#define DL_RO_DYN_SECTION 0 |
|
|
|
#endif /* _DL_RELOCATE_LD_H */ |
|
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h |
|
index ed10953f34b96c49..fcbbf6974827cdf1 100644 |
|
--- a/sysdeps/generic/ldsodefs.h |
|
+++ b/sysdeps/generic/ldsodefs.h |
|
@@ -69,6 +69,16 @@ __BEGIN_DECLS |
|
`ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'. */ |
|
#define ELFW(type) _ElfW (ELF, __ELF_NATIVE_CLASS, type) |
|
|
|
+/* Return true if dynamic section in the shared library L should be |
|
+ relocated. */ |
|
+ |
|
+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); |
|
+} |
|
+ |
|
/* All references to the value of l_info[DT_PLTGOT], |
|
l_info[DT_STRTAB], l_info[DT_SYMTAB], l_info[DT_RELA], |
|
l_info[DT_REL], l_info[DT_JMPREL], and l_info[VERSYMIDX (DT_VERSYM)] |
|
diff --git a/sysdeps/mips/dl-relocate-ld.h b/sysdeps/mips/dl-relocate-ld.h |
|
index 0c18d9a567cad54f..376ad75dd1695fe3 100644 |
|
--- a/sysdeps/mips/dl-relocate-ld.h |
|
+++ b/sysdeps/mips/dl-relocate-ld.h |
|
@@ -19,14 +19,7 @@ |
|
#ifndef _DL_RELOCATE_LD_H |
|
#define _DL_RELOCATE_LD_H |
|
|
|
-/* Return true if dynamic section in the shared library L should be |
|
- relocated. */ |
|
- |
|
-static inline bool |
|
-dl_relocate_ld (const struct link_map *l) |
|
-{ |
|
- /* Never relocate dynamic section. */ |
|
- return false; |
|
-} |
|
+/* The dynamic section is readonly. */ |
|
+#define DL_RO_DYN_SECTION 1 |
|
|
|
#endif /* _DL_RELOCATE_LD_H */ |
|
diff --git a/sysdeps/riscv/dl-relocate-ld.h b/sysdeps/riscv/dl-relocate-ld.h |
|
index 10327454b17a7097..2ab2b8ac6c09af82 100644 |
|
--- a/sysdeps/riscv/dl-relocate-ld.h |
|
+++ b/sysdeps/riscv/dl-relocate-ld.h |
|
@@ -19,14 +19,7 @@ |
|
#ifndef _DL_RELOCATE_LD_H |
|
#define _DL_RELOCATE_LD_H |
|
|
|
-/* Return true if dynamic section in the shared library L should be |
|
- relocated. */ |
|
- |
|
-static inline bool |
|
-dl_relocate_ld (const struct link_map *l) |
|
-{ |
|
- /* Never relocate dynamic section for ABI compatibility. */ |
|
- return false; |
|
-} |
|
+/* The dynamic section is readonly for ABI compatibility. */ |
|
+#define DL_RO_DYN_SECTION 1 |
|
|
|
#endif /* _DL_RELOCATE_LD_H */
|
|
|