Browse Source

aarch64: disable lazy relocations

Fixes segfaults in curl with gnutls encryption.
Waldemar Brodkorb 1 year ago
parent
commit
133909a8e0
1 changed files with 8 additions and 0 deletions
  1. 8 0
      ldso/ldso/aarch64/elfinterp.c

+ 8 - 0
ldso/ldso/aarch64/elfinterp.c

@@ -253,6 +253,8 @@ _dl_do_reloc (struct elf_resolve *tpnt, struct r_scope_elem *scope,
 	return 0;
 }
 
+#undef __AARCH64_LAZY_RELOC_WORKS
+#ifdef __AARCH64_LAZY_RELOC_WORKS
 static int
 _dl_do_lazy_reloc (struct elf_resolve *tpnt, struct r_scope_elem *scope,
 		   ELF_RELOC *rpnt, ElfW(Sym) *symtab, char *strtab)
@@ -303,11 +305,17 @@ _dl_do_lazy_reloc (struct elf_resolve *tpnt, struct r_scope_elem *scope,
 
 	return 0;
 }
+#endif
 
 void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
 	unsigned long rel_addr, unsigned long rel_size)
 {
+#ifdef __AARCH64_LAZY_RELOC_WORKS
 	(void)_dl_parse(rpnt->dyn, NULL, rel_addr, rel_size, _dl_do_lazy_reloc);
+#else
+	_dl_parse_relocation_information(rpnt, &_dl_loaded_modules->symbol_scope,
+									rel_addr, rel_size);
+#endif
 }
 
 int _dl_parse_relocation_information(struct dyn_elf *rpnt,