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

Timestamp:

Apr 1, 2022 2:02:04 PM (3 years ago)

Author:

vboxsync

Message:

Support: Disable dlopen() patching for ASAN builds for now as our patcher can't deal with the encountered instructions yet

File:

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

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

@@ -61 +61 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
+#ifndef SUP_HARDENED_WITHOUT_DLOPEN_PATCHING
 /**
  * Callback (SUPHARDENEDPOSIXHOOK::pfnResolv) for triggering lazy GOT resolver.
@@ -107 +108 @@
 #endif
 
+#endif /* SUP_HARDENED_WITHOUT_DLOPEN_PATCHING */
+
 
 /*********************************************************************************************************************************
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
+#ifndef SUP_HARDENED_WITHOUT_DLOPEN_PATCHING
 static FNSUPHARDENEDSYMRESOLVE supR3HardenedPosixMonitorDlopenResolve;
 #ifdef SUP_HARDENED_WITH_DLMOPEN
@@ -121 +125 @@
 DECLASM(void) supR3HardenedPosixMonitor_Dlmopen(Lmid_t idLm, const char *pszFilename, int fFlags);
 #endif
+#endif /* SUP_HARDENED_WITHOUT_DLOPEN_PATCHING */
 
 
@@ -126 +131 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
+#ifndef SUP_HARDENED_WITHOUT_DLOPEN_PATCHING
+
 RT_C_DECLS_BEGIN
 /** Resume patch for dlopen(), jumped to form assembly stub. */
@@ -620 +627 @@
 #endif
 
+#endif /* SUP_HARDENED_WITHOUT_DLOPEN_PATCHING */
+
 
 /**
@@ -630 +639 @@
 DECLHIDDEN(void) supR3HardenedPosixInit(void)
 {
+#ifndef SUP_HARDENED_WITHOUT_DLOPEN_PATCHING
     for (unsigned i = 0; i < RT_ELEMENTS(g_aHooks); i++)
     {
@@ -638 +648 @@
                                   "Failed to hook the %s interface", pHook->pszSymbol);
     }
+#endif
 }