Changeset 92113 in vbox for trunk/src

Timestamp:

Oct 27, 2021 8:00:05 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/ldrElf: Fixed incorrect validation of unknown dynamic table entries. A couple of PT_LOAD vs section validation hacks to make isolinux-debug.elf palatable.

File:

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

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

@@ -2386 +2386 @@
                 Elf_Xword       cbMem   = pPhdr->p_memsz;
                 Elf_Xword       cbFile  = pPhdr->p_filesz;
+
+                /* HACK to allow loading isolinux-debug.elf where program headers aren't
+                   sorted by virtual address. */
+                if (   (fFlags & RTLDR_O_FOR_DEBUG)
+                    && uAddr != paShdrs[iLoadShdr].sh_addr)
+                {
+                    for (unsigned iShdr = 1; iShdr < pModElf->Ehdr.e_shnum; iShdr++)
+                        if (uAddr == paShdrs[iShdr].sh_addr)
+                        {
+                            iLoadShdr = iShdr;
+                            break;
+                        }
+                }
+
                 while (cbMem > 0)
                 {
@@ -2473 +2487 @@
                             ?    off    == paShdrs[iLoadShdr].sh_offset
                               && cbFile >= paShdrs[iLoadShdr].sh_size /* this might be too strict... */
-                            : cbFile == 0) )
+                            :    cbFile == 0
+                              || cbMem > paShdrs[iLoadShdr].sh_size /* isolinux.elf: linker merge no-bits and progbits sections */) )
                     {
-                        if (paShdrs[iLoadShdr].sh_type != SHT_NOBITS)
+                        if (   paShdrs[iLoadShdr].sh_type != SHT_NOBITS
+                            || cbFile != 0)
                         {
                             off    += paShdrs[iLoadShdr].sh_size;
@@ -2757 +2773 @@
                 break;
             default:
-                if (   paDynamic[i].d_un.d_val < DT_ENCODING
-                    || (paDynamic[i].d_un.d_val & 1))
+                if (   paDynamic[i].d_tag <  DT_ENCODING
+                    || paDynamic[i].d_tag >= DT_LOOS
+                    || (paDynamic[i].d_tag & 1))
                     Log3(("RTLdrELF: DT[%u]: %#010RX64       %#RX64%s\n", i, (uint64_t)paDynamic[i].d_tag,
                           (uint64_t)paDynamic[i].d_un.d_val, paDynamic[i].d_un.d_val >= DT_ENCODING ? " (val)" : ""));