mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-19 13:40:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

elf: Move note processing after l_phdr is updated

Browse Source 
Program headers are processed in two pass: after the first pass
load segments are mmapped so in the second pass target specific
note processing logic can access the notes.

The second pass is moved later so various link_map fields are
set up that may be useful for note processing such as l_phdr.
The second pass should be before the fd is closed so that is
available.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Szabolcs Nagy 2020-10-29 13:29:15 +00:00
parent 8b8f616e6a
commit 38a3836011
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
elf/dl-load.c
View File

@ -1386,6 +1386,21 @@ cannot enable executable stack as shared object requires");
if (l->l_tls_initimage != NULL)
l->l_tls_initimage = (char *) l->l_tls_initimage + l->l_addr;
/* Process program headers again after load segments are mapped in
case processing requires accessing those segments. Scan program
headers backward so that PT_NOTE can be skipped if PT_GNU_PROPERTY
exits. */
for (ph = &l->l_phdr[l->l_phnum]; ph != l->l_phdr; --ph)
switch (ph[-1].p_type)
{
case PT_NOTE:
_dl_process_pt_note (l, &ph[-1]);
break;
case PT_GNU_PROPERTY:
_dl_process_pt_gnu_property (l, &ph[-1]);
break;
}
/* We are done mapping in the file. We no longer need the descriptor. */
if (__glibc_unlikely (__close_nocancel (fd) != 0))
{