Changeset 93274 in vbox

Timestamp:

Jan 17, 2022 2:42:20 PM (3 years ago)

Author:

vboxsync

Message:

/Config.kmk,SUPDrv-win.cpp: Run the security cookie initializer for .r0 modules. bugref:10162

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -5056 +5056 @@
  endif
 TEMPLATE_VBoxR0_LDFLAGS.win.amd64   = $(VBOX_VCC_LD_HIGH_ENTRYOPY_VA)
+ ifneq ($(VBOX_VCC_CC_GUARD_CF),)
+TEMPLATE_VBoxR0_LDFLAGS.win.amd64  += -Include:__security_init_cookie  -Export:ModuleInitSecurityCookie=__security_init_cookie
+TEMPLATE_VBoxR0_LDFLAGS.win.x86    += -Include:___security_init_cookie -Export:ModuleInitSecurityCookie=___security_init_cookie
+ endif
 TEMPLATE_VBoxR0_LIBS                = \
         $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
- if "$(VBOX_VCC_TOOL_STEM)" >= "VCC142" && !defined(VBOX_WITHOUT_CONTROL_FLOW_GUARD)
+ ifneq ($(VBOX_VCC_CC_GUARD_CF),)
 TEMPLATE_VBoxR0_LIBS               += \
         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/BufferOverflowK.lib

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

@@ -2703 +2703 @@
                 iDiff = supdrvNtCompare(pImage, pbImageBits, uRvaNext, pImage->cbImageBits - uRvaNext, pReq);
             if (!iDiff)
+            {
+                /*
+                 * If there is a cookie init export, call it.
+                 *
+                 * This typically just does:
+                 *      __security_cookie = (rdtsc ^ &__security_cookie) & 0xffffffffffff;
+                 *      __security_cookie_complement = ~__security_cookie;
+                 */
+                PFNRT pfnModuleInitSecurityCookie = NULL;
+                int rcSym = supdrvOSLdrQuerySymbol(pDevExt, pImage, RT_STR_TUPLE("ModuleInitSecurityCookie"),
+                                                   (void **)&pfnModuleInitSecurityCookie);
+                if (RT_SUCCESS(rcSym) && pfnModuleInitSecurityCookie)
+                    pfnModuleInitSecurityCookie();
+
                 return VINF_SUCCESS;
+            }
         }
         else