Changeset 96559 in vbox for trunk/src/VBox

Timestamp:

Aug 31, 2022 1:20:39 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt: GSHandlerCheck_SEH and a basic C_specific_handler. bugref:10261

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/compiler/vcc/except-seh-vcc.cpp (added)
• common/compiler/vcc/except-vcc.h (modified) (4 diffs)
• common/compiler/vcc/stack-except-seh-vcc.cpp (copied) (copied from trunk/src/VBox/Runtime/common/compiler/vcc/stack-except-vcc.cpp ) (5 diffs)
• common/compiler/vcc/stack-except-vcc.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2121 +2121 @@
         common/compiler/vcc/guard-vcc.asm \
         common/compiler/vcc/stack-vcc.asm \
-        common/compiler/vcc/stack-except-vcc.cpp
+        common/compiler/vcc/stack-except-vcc.cpp \
+        common/compiler/vcc/stack-except-seh-vcc.cpp \
+        common/compiler/vcc/except-seh-vcc.cpp
   RuntimeR3_SOURCES.win.x86 = $(RuntimeBaseR3_SOURCES.win.x86) \
         r3/win/nocrt-atexit-win.asm \

trunk/src/VBox/Runtime/common/compiler/vcc/except-vcc.h

@@ -41 +41 @@
 #endif
 
+#define __C_specific_handler their___C_specific_handler
+#include <iprt/win/windows.h>
+#undef __C_specific_handler
 
 #include <iprt/types.h>
 #include <iprt/assertcompile.h>
+
+
+RT_C_DECLS_BEGIN
 
 #if 0
@@ -128 +134 @@
         {
             uint32_t    fEHandler : 1;
-#define GS_HANDLER_OFF_COOKIE_IS_EHANDLER   RT_BIT(0)
+#define GS_HANDLER_OFF_COOKIE_IS_EHANDLER   RT_BIT(0) /**< Handles exceptions. */
             uint32_t    fUHandler : 1;
-#define GS_HANDLER_OFF_COOKIE_IS_UHANDLER   RT_BIT(1)
+#define GS_HANDLER_OFF_COOKIE_IS_UHANDLER   RT_BIT(1) /**< Handles unwind. */
             uint32_t    fHasAlignment : 1;
-#define GS_HANDLER_OFF_COOKIE_HAS_ALIGNMENT RT_BIT(2)
+#define GS_HANDLER_OFF_COOKIE_HAS_ALIGNMENT RT_BIT(2) /**< Has the uAlignmentMask member. */
         } Bits;
 #define GS_HANDLER_OFF_COOKIE_MASK          UINT32_C(0xfffffff8) /**< Mask to apply to offCookie to the the value. */
@@ -138 +144 @@
     } u;
     int32_t             offAlignedBase;
+    /** This field is only there when GS_HANDLER_OFF_COOKIE_HAS_ALIGNMENT is set.
+     * it seems. */
     uint32_t            uAlignmentMask;
 } GS_HANDLER_DATA;
@@ -150 +158 @@
 #endif
 
+#if defined(RT_ARCH_AMD64)
+EXCEPTION_DISPOSITION __C_specific_handler(PEXCEPTION_RECORD pXcptRec, PEXCEPTION_REGISTRATION_RECORD pXcptRegRec,
+                                           PCONTEXT pCpuCtx, PDISPATCHER_CONTEXT pDispCtx);
+#endif
+
+RT_C_DECLS_END
+
 #endif /* !IPRT_INCLUDED_SRC_common_compiler_vcc_except_vcc_h */
 

trunk/src/VBox/Runtime/common/compiler/vcc/stack-except-seh-vcc.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Visual C++ Compiler - Stack Checking, __GSHandlerCheck.
+ * IPRT - Visual C++ Compiler - Stack Checking, __GSHandlerCheck_SEH.
  */
 
@@ -41 +41 @@
 #include "internal/nocrt.h"
 
-#include <iprt/win/windows.h>
-
-#include <iprt/asm.h>
-#include <iprt/asm-amd64-x86.h>
-#ifndef IPRT_NOCRT_WITHOUT_FATAL_WRITE
-# include <iprt/assert.h>
-#endif
-
-#include "internal/compiler-vcc.h"
 #include "except-vcc.h"
 
@@ -65 +56 @@
  * triggering an exception.
  *
- * This does not call any C++ exception handlers, as it's probably (still
- * figuring this stuff out) only used when C++ exceptions are disabled.
+ * This is called for windows' structured exception handling (SEH), i.e. the
+ * __try/__except/__finally stuff in Visual C++, for which the compiler
+ * generates somewhat different strctures compared to the plain __GSHanderCheck
+ * scenario.
  *
  * @returns Exception disposition.
@@ -76 +69 @@
  */
 extern "C" __declspec(guard(suppress))
-EXCEPTION_DISPOSITION __GSHandlerCheck(PEXCEPTION_RECORD pXcptRec, PEXCEPTION_REGISTRATION_RECORD pXcptRegRec,
-                                       PCONTEXT pCpuCtx, PDISPATCHER_CONTEXT pDispCtx)
+EXCEPTION_DISPOSITION __GSHandlerCheck_SEH(PEXCEPTION_RECORD pXcptRec, PEXCEPTION_REGISTRATION_RECORD pXcptRegRec,
+                                           PCONTEXT pCpuCtx, PDISPATCHER_CONTEXT pDispCtx)
 {
-    RT_NOREF(pXcptRec, pCpuCtx);
+    /*
+     * The HandlerData points to a scope table, which is then followed by GS_HANDLER_DATA.
+     *
+     * Sample offCookie values: 0521H (tst.cpp), 02caH (installNetLwf), and 0502H (installNetFlt).
+     */
+    SCOPE_TABLE const *pScopeTable  = (SCOPE_TABLE const *)pDispCtx->HandlerData;
+    PCGS_HANDLER_DATA  pHandlerData = (PCGS_HANDLER_DATA)&pScopeTable->ScopeRecord[pScopeTable->Count];
 
     /*
      * Locate the stack cookie and call the regular stack cookie checker routine.
+     * (Same code as in __GSHandlerCheck, fixes applies both places.)
      */
-    PCGS_HANDLER_DATA pHandlerData = (PCGS_HANDLER_DATA)pDispCtx->HandlerData;
-
     /* Calculate the cookie address and read it. */
     uintptr_t uPtrFrame = (uintptr_t)pXcptRegRec;
@@ -107 +105 @@
     __security_check_cookie(uCookie ^ uXorAddr);
 
+
+    /*
+     * Now call the handler if the GS handler data indicates that we ought to.
+     */
+    if (  (IS_UNWINDING(pXcptRec->ExceptionFlags) ? GS_HANDLER_OFF_COOKIE_IS_UHANDLER : GS_HANDLER_OFF_COOKIE_IS_EHANDLER)
+        & pHandlerData->u.offCookie)
+        return __C_specific_handler(pXcptRec, pXcptRegRec, pCpuCtx, pDispCtx);
+
     return ExceptionContinueSearch;
 }

trunk/src/VBox/Runtime/common/compiler/vcc/stack-except-vcc.cpp

@@ -41 +41 @@
 #include "internal/nocrt.h"
 
-#include <iprt/win/windows.h>
-
-#include <iprt/asm.h>
-#include <iprt/asm-amd64-x86.h>
-#ifndef IPRT_NOCRT_WITHOUT_FATAL_WRITE
-# include <iprt/assert.h>
-#endif
-
-#include "internal/compiler-vcc.h"
 #include "except-vcc.h"
 
@@ -82 +73 @@
 
     /*
-     * Locate the stack cookie and call the regular stack cookie checker routine.
+     * Only GS handler data here.
      */
     PCGS_HANDLER_DATA pHandlerData = (PCGS_HANDLER_DATA)pDispCtx->HandlerData;
 
+    /*
+     * Locate the stack cookie and call the regular stack cookie checker routine.
+     * (Same code as in __GSHandlerCheck_SEH, fixes applies both places.)
+     */
     /* Calculate the cookie address and read it. */
     uintptr_t uPtrFrame = (uintptr_t)pXcptRegRec;