Changeset 93273 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jan 17, 2022 12:34:44 PM (3 years ago)

Author:

vboxsync

Message:

SUPDrv/win: A few more things to ignore when loading images with -guard:cf enabled. bugref:10162

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -2529 +2529 @@
         uint32_t    uRva;
         uint32_t    cb;
-    }               aRegions[16];
+    }               aRegions[20];
 } SUPDRVNTEXCLREGIONS;
 
@@ -2668 +2668 @@
                 && pCfg->SecurityCookie != NULL)
                 supdrvNtAddExclRegion(&ExcludeRegions, (uintptr_t)pCfg->SecurityCookie - (uintptr_t)pImage->pvImage, sizeof(void *));
+
+            /* Also exclude the GuardCFCheckFunctionPointer and GuardCFDispatchFunctionPointer pointer variables. */
+            if (   pCfg->Size >= RT_UOFFSET_AFTER(IMAGE_LOAD_CONFIG_DIRECTORY, GuardCFCheckFunctionPointer)
+                && pCfg->GuardCFCheckFunctionPointer != NULL)
+                supdrvNtAddExclRegion(&ExcludeRegions, (uintptr_t)pCfg->GuardCFCheckFunctionPointer - (uintptr_t)pImage->pvImage, sizeof(void *));
+            if (   pCfg->Size >= RT_UOFFSET_AFTER(IMAGE_LOAD_CONFIG_DIRECTORY, GuardCFDispatchFunctionPointer)
+                && pCfg->GuardCFDispatchFunctionPointer != NULL)
+                supdrvNtAddExclRegion(&ExcludeRegions, (uintptr_t)pCfg->GuardCFDispatchFunctionPointer - (uintptr_t)pImage->pvImage, sizeof(void *));
+
+            /* Ditto for the XFG variants: */
+            if (   pCfg->Size >= RT_UOFFSET_AFTER(IMAGE_LOAD_CONFIG_DIRECTORY, GuardXFGCheckFunctionPointer)
+                && pCfg->GuardXFGCheckFunctionPointer != NULL)
+                supdrvNtAddExclRegion(&ExcludeRegions, (uintptr_t)pCfg->GuardXFGCheckFunctionPointer - (uintptr_t)pImage->pvImage, sizeof(void *));
+            if (   pCfg->Size >= RT_UOFFSET_AFTER(IMAGE_LOAD_CONFIG_DIRECTORY, GuardXFGDispatchFunctionPointer)
+                && pCfg->GuardXFGDispatchFunctionPointer != NULL)
+                supdrvNtAddExclRegion(&ExcludeRegions, (uintptr_t)pCfg->GuardXFGDispatchFunctionPointer - (uintptr_t)pImage->pvImage, sizeof(void *));
+
+            /** @todo What about GuardRFVerifyStackPointerFunctionPointer and
+             * GuardRFFailureRoutineFunctionPointer? Ignore for now as the compiler we're
+             * using (19.26.28805) sets them to zero from what I can tell. */
 
             /*