TODO(api): cheri: fix dl_iterate_phdr dlpi_addr

The dlpi_addr field is a capability that has value l_addr, but we can
only do this for libraries (ET_DYN) where l_addr == l_map_start,
otherwise we return l_addr which is normally 0 then (ET_EXEC) so the
caller can detect and special case it.

For now l_addr != 0 and l_addr != l_map_start case is not supported.
Note: this api may be used by the unwinder to find and read .eh_frame
data.

TODO: dlpi_addr could be address only, but requires unwinder update
and agreement about the abi.
This commit is contained in:
Szabolcs Nagy 2022-09-07 17:37:38 +01:00
parent 66e78c5b74
commit bbfb104b50

View File

@ -61,7 +61,13 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
{
#ifdef __CHERI_PURE_CAPABILITY__
info.dlpi_addr = l->l_real->l_addr == l->l_real->l_map_start
? l->l_real->l_map_start
: l->l_real->l_addr;
#else
info.dlpi_addr = l->l_real->l_addr;
#endif
info.dlpi_name = l->l_real->l_name;
info.dlpi_phdr = l->l_real->l_phdr;
info.dlpi_phnum = l->l_real->l_phnum;