diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2020-10-28 15:17:06 +0000 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2020-12-11 15:45:37 +0000 |
| commit | c00452d7757a300931ee186d043c43b48eeb0875 (patch) | |
| tree | 5107070cbfbdd9f3ceb17038986a90e2f4824d0d /elf | |
| parent | 38a3836011f3fe3290a94ab136dcb5f3c5c9f4e2 (diff) | |
| download | glibc-c00452d7757a300931ee186d043c43b48eeb0875.tar.gz glibc-c00452d7757a300931ee186d043c43b48eeb0875.tar.xz glibc-c00452d7757a300931ee186d043c43b48eeb0875.zip | |
elf: Pass the fd to note processing
To handle GNU property notes on aarch64 some segments need to be mmaped again, so the fd of the loaded ELF module is needed. When the fd is not available (kernel loaded modules), then -1 is passed. The fd is passed to both _dl_process_pt_gnu_property and _dl_process_pt_note for consistency. Target specific note processing functions are updated accordingly. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-load.c | 12 | ||||
| -rw-r--r-- | elf/rtld.c | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index a21bdeb5c3..e9afad544a 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -864,10 +864,12 @@ lose (int code, int fd, const char *name, char *realname, struct link_map *l, /* Process PT_GNU_PROPERTY program header PH in module L after PT_LOAD segments are mapped. Only one NT_GNU_PROPERTY_TYPE_0 - note is handled which contains processor specific properties. */ + note is handled which contains processor specific properties. + FD is -1 for the kernel mapped main executable otherwise it is + the fd used for loading module L. */ void -_dl_process_pt_gnu_property (struct link_map *l, const ElfW(Phdr) *ph) +_dl_process_pt_gnu_property (struct link_map *l, int fd, const ElfW(Phdr) *ph) { const ElfW(Nhdr) *note = (const void *) (ph->p_vaddr + l->l_addr); const ElfW(Addr) size = ph->p_memsz; @@ -914,7 +916,7 @@ _dl_process_pt_gnu_property (struct link_map *l, const ElfW(Phdr) *ph) last_type = type; /* Target specific property processing. */ - if (_dl_process_gnu_property (l, type, datasz, ptr) == 0) + if (_dl_process_gnu_property (l, fd, type, datasz, ptr) == 0) return; /* Check the next property item. */ @@ -1394,10 +1396,10 @@ cannot enable executable stack as shared object requires"); switch (ph[-1].p_type) { case PT_NOTE: - _dl_process_pt_note (l, &ph[-1]); + _dl_process_pt_note (l, fd, &ph[-1]); break; case PT_GNU_PROPERTY: - _dl_process_pt_gnu_property (l, &ph[-1]); + _dl_process_pt_gnu_property (l, fd, &ph[-1]); break; } diff --git a/elf/rtld.c b/elf/rtld.c index c295174a16..526360237f 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1558,10 +1558,10 @@ dl_main (const ElfW(Phdr) *phdr, switch (ph[-1].p_type) { case PT_NOTE: - _dl_process_pt_note (main_map, &ph[-1]); + _dl_process_pt_note (main_map, -1, &ph[-1]); break; case PT_GNU_PROPERTY: - _dl_process_pt_gnu_property (main_map, &ph[-1]); + _dl_process_pt_gnu_property (main_map, -1, &ph[-1]); break; } |