Author: kib
Date: Thu Jun 25 05:44:06 2020
New Revision: 362607
URL: https://svnweb.freebsd.org/changeset/base/362607
Log:
MFC r362346:
rtld: Parse own phdr and notes.
Modified:
stable/11/libexec/rtld-elf/rtld.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/11/libexec/rtld-elf/rtld.c Thu Jun 25 05:35:46 2020
(r362606)
+++ stable/11/libexec/rtld-elf/rtld.c Thu Jun 25 05:44:06 2020
(r362607)
@@ -2111,6 +2111,34 @@ process_z(Obj_Entry *root)
}
}
}
+
+static void
+parse_rtld_phdr(Obj_Entry *obj)
+{
+ const Elf_Phdr *ph;
+ Elf_Addr note_start, note_end;
+
+ obj->stack_flags = PF_X | PF_R | PF_W;
+ for (ph = obj->phdr; (const char *)ph < (const char *)obj->phdr +
+ obj->phsize; ph++) {
+ switch (ph->p_type) {
+ case PT_GNU_STACK:
+ obj->stack_flags = ph->p_flags;
+ break;
+ case PT_GNU_RELRO:
+ obj->relro_page = obj->relocbase +
+ trunc_page(ph->p_vaddr);
+ obj->relro_size = round_page(ph->p_memsz);
+ break;
+ case PT_NOTE:
+ note_start = (Elf_Addr)obj->relocbase + ph->p_vaddr;
+ note_end = note_start + ph->p_filesz;
+ digest_notes(obj, note_start, note_end);
+ break;
+ }
+ }
+}
+
/*
* Initialize the dynamic linker. The argument is the address at which
* the dynamic linker has been mapped into memory. The primary task of
@@ -2179,6 +2207,8 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info)
/* Replace the path with a dynamically allocated copy. */
obj_rtld.path = xstrdup(ld_path_rtld);
+
+ parse_rtld_phdr(&obj_rtld);
r_debug.r_brk = r_debug_state;
r_debug.r_state = RT_CONSISTENT;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
