Changeset 85503 in vbox for trunk/src/VBox/Runtime/common/ldr

Timestamp:

Jul 29, 2020 9:53:31 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139569

Message:

IPRT/ldrELF: Early support for loading ET_DYN images. Current code is a bit cumbersome as it approaches it from the ET_REL/sections perspective rather than using program headers and the dynamic section. [build fixes] bugref:9801

File:

• trunk/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h (modified) (4 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h

@@ -1181 +1181 @@
         else
             rc = RTLDRELF_NAME(RelocateSectionExecDyn)(pModElf, BaseAddr, pfnGetImport, pvUser,
-                                                       0, pModElf->cbImage,
+                                                       0, (Elf_Size)pModElf->cbImage,
                                                        (const uint8_t *)pModElf->pvBits /** @todo file offset ?? */,
                                                        (uint8_t *)pvBits,
@@ -2122 +2122 @@
             if (pModElf->Ehdr.e_type != ET_DYN && pModElf->Ehdr.e_type != ET_EXEC)
                 return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-                                           "Unexpected SHT_DYNAMIC (i=%d) for e_type=%d", pszLogName, i, pModElf->Ehdr.e_type);
+                                           "%s: Unexpected SHT_DYNAMIC (i=%d) for e_type=%d", pszLogName, i, pModElf->Ehdr.e_type);
             if (paShdrs[i].sh_entsize != sizeof(Elf_Dyn))
                 return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
@@ -2131 +2131 @@
             if (cDynamic > _64K || cDynamic < 2)
                 return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-                                           "%s: SHT_DYNAMIC (i=%d) sh_size=" FMT_ELF_XWORD " is out of range, expected %u",
+                                           "%s: SHT_DYNAMIC (i=%d) sh_size=" FMT_ELF_XWORD " is out of range (2..64K)",
                                            pszLogName, i, paShdrs[i].sh_size);
             pModElf->cDynamic = (unsigned)cDynamic;
@@ -2778 +2778 @@
             return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
                                        "%s: section header #%u (%s type=" FMT_ELF_WORD " size=" FMT_ELF_XWORD ") contains relocations not referenced by the dynamic section",
-                                       pszLogName,
+                                       pszLogName, i,
                                        RTLDRELF_NAME(GetSHdrName)(pModElf, paShdrs[i].sh_name, szSecHdrNm, sizeof(szSecHdrNm)),
                                        paShdrs[i].sh_type, paShdrs[i].sh_size);