Changeset 75267 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

Timestamp:

Nov 6, 2018 6:58:03 AM (6 years ago)

Author:

vboxsync

Message:

OpenGL: make runtime loading of shared objects work without DT_RPATH.
bugref:8019: GCC sanitisers
Unfortunately gcc address sanitiser breaks DT_RPATH, and our host OpenGL test
tool depends on this when trying to load the libraries. The simple fix is to
retry loading the library in RTPathSharedLibs() if the first load attempt
fails.

File:

• trunk/src/VBox/GuestHost/OpenGL/util/dll.c (modified) (2 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/dll.c

@@ -16 +16 @@
 
 #if defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(DARWIN) || defined(SunOS) || defined(OSF1)
+# include <iprt/assert.h>
+# include <iprt/err.h>
+# include <iprt/path.h>
 #include <dlfcn.h>
 #endif
@@ -274 +277 @@
         };
 #elif defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
-        if (resolveGlobal)
-                dll->hinstLib = dlopen( dllname, RTLD_LAZY | RTLD_GLOBAL );
-        else
-                dll->hinstLib = dlopen( dllname, RTLD_LAZY );
-        dll_err = (char*) dlerror();
+        {
+                int flags = RTLD_LAZY;
+                if (resolveGlobal)
+                   flags |= RTLD_GLOBAL;
+                dll->hinstLib = dlopen( dllname, flags );
+# ifndef IN_GUEST
+                /* GCC address sanitiser breaks DT_RPATH. */
+                if (!dll->hinstLib) do {
+                        char szPath[RTPATH_MAX];
+                        int rc = RTPathSharedLibs(szPath, sizeof(szPath));
+                        AssertLogRelMsgRCBreak(rc, ("RTPathSharedLibs() failed: %Rrc\n", rc));
+                        rc = RTPathAppend(szPath, sizeof(szPath), dllname);
+                        AssertLogRelMsgRCBreak(rc, ("RTPathAppend() failed: %Rrc\n", rc));
+                        dll->hinstLib = dlopen( szPath, flags );
+                } while(0);
+# endif
+                dll_err = (char*) dlerror();
+        }
 #else
 #error DSO