Changeset 60699 in vbox

Timestamp:

Apr 25, 2016 10:19:52 PM (9 years ago)

Author:

vboxsync

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

106872

Message:

ldrPE.cpp: Implemented a more relaxed approach to the ever changing LOAD_IMAGE_CONFIG_DIRECTORY structure: Accept a bunch more bytes provided they are all zero.

File:

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

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -3499 +3499 @@
     {
         IMAGE_LOAD_CONFIG_DIRECTORY64   Cfg64;
+        uint8_t                         abZeros[sizeof(IMAGE_LOAD_CONFIG_DIRECTORY64_V5) * 4];
     } u;
 
@@ -3525 +3526 @@
                                 : sizeof(IMAGE_LOAD_CONFIG_DIRECTORY64_V2) /*No V1*/;
 
+        bool fNewerStructureHack = false;
         if (   Dir.Size != cbExpectV5
             && Dir.Size != cbExpectV4
@@ -3531 +3533 @@
             && Dir.Size != cbExpectV1)
         {
-            Log(("rtldrPEOpen: %s: load cfg dir: unexpected dir size of %u bytes, expected %zu, %zu, %zu, %zu, or %zu.\n",
-                 pszLogName, Dir.Size, cbExpectV5, cbExpectV4, cbExpectV3, cbExpectV2, cbExpectV1));
-            return RTErrInfoSetF(pErrInfo, VERR_LDRPE_LOAD_CONFIG_SIZE,
-                                 "Unexpected load config dir size of %u bytes; supported sized: %zu, %zu, %zu, %zu, or %zu",
-                                 Dir.Size, cbExpectV5, cbExpectV4, cbExpectV3, cbExpectV2, cbExpectV1);
+            fNewerStructureHack = Dir.Size > cbExpectV5  /* These structure changes are slowly getting to us! More futher down. */
+                               && Dir.Size <= sizeof(u);
+            Log(("rtldrPEOpen: %s: load cfg dir: unexpected dir size of %u bytes, expected %zu, %zu, %zu, %zu, or %zu.%s\n",
+                 pszLogName, Dir.Size, cbExpectV5, cbExpectV4, cbExpectV3, cbExpectV2, cbExpectV1,
+                 fNewerStructureHack ? " Will try ignore extra bytes if all zero." : ""));
+            if (!fNewerStructureHack)
+                return RTErrInfoSetF(pErrInfo, VERR_LDRPE_LOAD_CONFIG_SIZE,
+                                     "Unexpected load config dir size of %u bytes; supported sized: %zu, %zu, %zu, %zu, or %zu",
+                                     Dir.Size, cbExpectV5, cbExpectV4, cbExpectV3, cbExpectV2, cbExpectV1);
         }
 
         /*
-         * Read and convert to 64-bit.
+         * Read, check new stuff and convert to 64-bit.
+         *
+         * If we accepted a newer structure, we check whether the new bits are
+         * all zero.  This PRAYING/ASSUMING that the nothing new weird stuff is
+         * activated by a zero value and that it'll mostly be unused in areas
+         * we care about (which has been the case till now).
          */
         RT_ZERO(u.Cfg64);
@@ -3545 +3556 @@
         if (RT_FAILURE(rc))
             return rc;
+        if (   fNewerStructureHack
+            && !ASMMemIsZero(&u.abZeros[cbExpectV5], Dir.Size - cbExpectV5))
+        {
+            Log(("rtldrPEOpen: %s: load cfg dir: Unexpected bytes are non-zero (%u bytes of which %u expected to be zero): %.*Rhxs\n",
+                 pszLogName, Dir.Size, Dir.Size - cbExpectV5, Dir.Size - cbExpectV5, &u.abZeros[cbExpectV5]));
+            return RTErrInfoSetF(pErrInfo, VERR_LDRPE_LOAD_CONFIG_SIZE,
+                                 "Grown load config (%u to %u bytes) includes non-zero bytes: %.*Rhxs",
+                                 cbExpectV5, Dir.Size, Dir.Size - cbExpectV5, &u.abZeros[cbExpectV5]);
+        }
         rtldrPEConvert32BitLoadConfigTo64Bit(&u.Cfg64);