Changeset 60450 in vbox

Timestamp:

Apr 12, 2016 11:49:23 AM (9 years ago)

Author:

vboxsync

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

106537

Message:

ldrELFRelocatable.cpp.h: Fixed incorrect st_shndx validation. Used symbol count instead of section count.

File:

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

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

@@ -250 +250 @@
         else
         {
-            AssertMsgReturn(pSym->st_shndx < pModElf->cSyms || pSym->st_shndx == SHN_ABS, ("%#x\n", pSym->st_shndx),
+            AssertMsgReturn(pSym->st_shndx < pModElf->Ehdr.e_shnum || pSym->st_shndx == SHN_ABS, ("%#x\n", pSym->st_shndx),
                             VERR_LDRELF_INVALID_RELOCATION_OFFSET);
 #if   ELF_MODE == 64
@@ -258 +258 @@
 
 #if   ELF_MODE == 64
-        /* Calc the value. */
+        /* Calc the value (indexes checked above; assumes SHN_UNDEF == 0). */
         Elf_Addr Value;
-        if (pSym->st_shndx < pModElf->cSyms)
+        if (pSym->st_shndx < pModElf->Ehdr.e_shnum)
             Value = SymValue + offDelta;
-        else
+        else /* SHN_ABS: */
             Value = SymValue + paRels[iRel].r_addend;
 #endif