Changeset 86224 in vbox for trunk/src/VBox/HostDrivers/Support/posix

Timestamp:

Sep 22, 2020 2:23:25 PM (4 years ago)

Author:

vboxsync

Message:

SUPHard/posix: Function pointer exception hancks for Clang. bugref:9790 bugref:9794

File:

• trunk/src/VBox/HostDrivers/Support/posix/SUPR3HardenedMain-posix.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/posix/SUPR3HardenedMain-posix.cpp

@@ -96 +96 @@
     PFNRT                    pfnHook;
     /** Where to store the pointer to the code into patch memory
-     * which resumes the original call. */
-    PFNRT                   *ppfnRealResume;
+     * which resumes the original call.
+     * @note uintptr_t instead of PFNRT is for Clang 11. */
+    uintptr_t               *ppfnRealResume;
     /** Pointer to the resolver method used on Solaris. */
     PFNSUPHARDENEDSYMRESOLVE pfnResolve;
@@ -156 +157 @@
 static SUPHARDENEDPOSIXHOOK const g_aHooks[] =
 {
-    /* pszSymbol,       pfnHook,                                     ppfnRealResume,   pfnResolve */
-    { "dlopen",  (PFNRT)supR3HardenedPosixMonitor_Dlopen,  (PFNRT *)&g_pfnDlopenReal,  supR3HardenedPosixMonitorDlopenResolve  },
+    /* pszSymbol,       pfnHook,                                         ppfnRealResume,   pfnResolve */
+    { "dlopen",  (PFNRT)supR3HardenedPosixMonitor_Dlopen,  (uintptr_t *)&g_pfnDlopenReal,  supR3HardenedPosixMonitorDlopenResolve  },
 #ifdef SUP_HARDENED_WITH_DLMOPEN
-    { "dlmopen", (PFNRT)supR3HardenedPosixMonitor_Dlmopen, (PFNRT *)&g_pfnDlmopenReal, supR3HardenedPosixMonitorDlmopenResolve }
+    { "dlmopen", (PFNRT)supR3HardenedPosixMonitor_Dlmopen, (uintptr_t *)&g_pfnDlmopenReal, supR3HardenedPosixMonitorDlmopenResolve }
 #endif
 };
@@ -315 +316 @@
  * @param   pfnResolve          The resolver to call before trying to query the start address.
  */
-static int supR3HardenedMainPosixHookOne(const char *pszSymbol, PFNRT pfnHook, PFNRT *ppfnReal,
+static int supR3HardenedMainPosixHookOne(const char *pszSymbol, PFNRT pfnHook, uintptr_t /*PFNRT*/ *ppfnReal,
                                          PFNSUPHARDENEDSYMRESOLVE pfnResolve)
 {
@@ -399 +400 @@
 
     /* Assemble the code for resuming the call.*/
-    *ppfnReal = (PFNRT)(uintptr_t)pbPatchMem;
+    *ppfnReal = (uintptr_t)pbPatchMem;
 
     /* Go through the instructions to patch and fixup any rip relative mov instructions. */
@@ -532 +533 @@
 
     /* Assemble the code for resuming the call.*/
-    *ppfnReal = (PFNRT)(uintptr_t)pbPatchMem;
+    *ppfnReal = (uintptr_t)pbPatchMem;
 
     /* Go through the instructions to patch and fixup any relative call instructions. */