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

Timestamp:

Jul 21, 2013 9:59:53 PM (12 years ago)

Author:

vboxsync

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

87425

Message:

Fixes related to reading symbols from a 64-bit linux kernel (3.7).

File:

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

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

@@ -1096 +1096 @@
      */
     char            szName[32];
+    Elf_Addr        uPrevMappedRva = 0;
     const Elf_Shdr *paShdrs    = pModElf->paShdrs;
     const Elf_Shdr *paOrgShdrs = pModElf->paOrgShdrs;
@@ -1124 +1125 @@
             const Elf_Shdr *pShdr2 = RTLDRELF_NAME(GetFirstAllocatedSection)(&paShdrs[iShdr + 1],
                                                                              pModElf->Ehdr.e_shnum - iShdr - 1);
-            Seg.cbMapped    = pShdr2 ? pShdr2->sh_addr - paShdrs[iShdr].sh_addr : paShdrs[iShdr].sh_size;
+            if (   pShdr2
+                && pShdr2->sh_addr >= paShdrs[iShdr].sh_addr
+                && Seg.RVA >= uPrevMappedRva)
+                Seg.cbMapped = pShdr2->sh_addr - paShdrs[iShdr].sh_addr;
+            else
+                Seg.cbMapped = RT_MAX(paShdrs[iShdr].sh_size, paShdrs[iShdr].sh_addralign);
+            uPrevMappedRva = Seg.RVA;
         }
         else
@@ -1782 +1789 @@
                  * Validate the section headers and find relevant sections.
                  */
+                Elf_Addr uNextAddr = 0;
                 for (unsigned i = 0; i < pModElf->Ehdr.e_shnum; i++)
                 {
@@ -1822 +1830 @@
                     }
 
+                    /* Kluge for the .data..percpu segment in 64-bit linux kernels. */
+                    if (paShdrs[i].sh_flags & SHF_ALLOC)
+                    {
+                        if (   paShdrs[i].sh_addr == 0
+                            && paShdrs[i].sh_addr < uNextAddr)
+                        {
+                            Elf_Addr uAddr = RT_ALIGN_T(uNextAddr, paShdrs[i].sh_addralign, Elf_Addr);
+                            Log(("RTLdrElf: Out of order section #%d; adjusting sh_addr from " FMT_ELF_ADDR " to " FMT_ELF_ADDR "\n",
+                                 paShdrs[i].sh_addr, uAddr));
+                            paShdrs[i].sh_addr = uAddr;
+                        }
+                        uNextAddr = paShdrs[i].sh_addr + paShdrs[i].sh_size;
+                    }
                 } /* for each section header */