mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-30 12:31:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

elf: Pass the fd to note processing

Browse Source 
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>
This commit is contained in:
Szabolcs Nagy 2020-10-28 15:17:06 +00:00
parent 38a3836011
commit c00452d775
6 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
elf/dl-load.c
View File

@ -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;
}

4
elf/rtld.c
View File

@ -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;
}

6
sysdeps/aarch64/dl-prop.h
View File

@ -35,13 +35,13 @@ _dl_open_check (struct link_map *m)
}
static inline void __attribute__ ((always_inline))
_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph)
_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph)
{
}
static inline int
_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz,
void *data)
_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type,
uint32_t datasz, void *data)
{
if (type == GNU_PROPERTY_AARCH64_FEATURE_1_AND)
{

6
sysdeps/generic/dl-prop.h
View File

@ -37,15 +37,15 @@ _dl_open_check (struct link_map *m)
}
static inline void __attribute__ ((always_inline))
_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph)
_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph)
{
}
/* Called for each property in the NT_GNU_PROPERTY_TYPE_0 note of L,
processing of the properties continues until this returns 0. */
static inline int __attribute__ ((always_inline))
_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz,
void *data)
_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type,
uint32_t datasz, void *data)
{
return 0;
}

5
sysdeps/generic/ldsodefs.h
View File

@ -933,8 +933,9 @@ extern void _dl_rtld_di_serinfo (struct link_map *loader,
Dl_serinfo *si, bool counting);
/* Process PT_GNU_PROPERTY program header PH in module L after
PT_LOAD segments are mapped. */
void _dl_process_pt_gnu_property (struct link_map *l, const ElfW(Phdr) *ph);
PT_LOAD segments are mapped from file FD. */
void _dl_process_pt_gnu_property (struct link_map *l, int fd,
const ElfW(Phdr) *ph);
/* Search loaded objects' symbol tables for a definition of the symbol

6
sysdeps/x86/dl-prop.h
View File

@ -145,15 +145,15 @@ _dl_process_cet_property_note (struct link_map *l,
}
static inline void __attribute__ ((unused))
_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph)
_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph)
{
const ElfW(Nhdr) *note = (const void *) (ph->p_vaddr + l->l_addr);
_dl_process_cet_property_note (l, note, ph->p_memsz, ph->p_align);
}
static inline int __attribute__ ((always_inline))
_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz,
void *data)
_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type,
uint32_t datasz, void *data)
{
return 0;
}