Changeset 79559 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Jul 5, 2019 3:42:51 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131847

Message:

IPRT/process-creation-posix.cpp: Try to dynamically resolve crypt_r on linux. [adjustments] ticketref:18682

Location:

trunk/src/VBox/Runtime/r3/posix

Files:

• ldrNative-posix.cpp (modified) (1 diff)
• process-creation-posix.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp

@@ -148 +148 @@
     size_t const cchFilename = strlen(pszFilename);
     size_t const cchSuffix   = strlen(pszExt);
-    char *pszTmp = (char *)alloca(cchFilename + cchSuffix + 1);
+    char *pszTmp = (char *)alloca(cchFilename + cchSuffix + 16 + 1);
     memcpy(pszTmp, pszFilename, cchFilename);
     memcpy(&pszTmp[cchFilename], pszExt, cchSuffix);
     pszTmp[cchFilename + cchSuffix] = '\0';
 
-    return RTLdrLoadEx(pszTmp, phLdrMod, fFlags, NULL);
+    int rc = RTLdrLoadEx(pszTmp, phLdrMod, fFlags, NULL);
+
+#if !defined(RT_OS_DARWIN) && !defined(RT_OS_OS2) && !defined(RT_OS_WINDOWS)
+    /*
+     * If no version was given after the .so and do .so.MAJOR search according
+     * to the range in the fFlags.
+     */
+    if (RT_FAILURE(rc) && !(fFlags & RTLDRLOAD_FLAGS_NO_SUFFIX))
+    {
+        const char *pszActualSuff = RTPathSuffix(pszTmp);
+        if (pszActualSuff && strcmp(pszActualSuff, ".so") == 0)
+        {
+            uint32_t const uBegin = (fFlags & RTLDRLOAD_FLAGS_SO_VER_BEGIN_MASK) >> RTLDRLOAD_FLAGS_SO_VER_BEGIN_SHIFT;
+            uint32_t const uEnd   = (fFlags & RTLDRLOAD_FLAGS_SO_VER_END_MASK)   >> RTLDRLOAD_FLAGS_SO_VER_END_SHIFT;
+            int32_t const  iIncr  = uBegin <= uEnd ? 1 : -1;
+            for (uint32_t uMajorVer = uBegin; uMajorVer != uEnd; uMajorVer += iIncr)
+            {
+                RTStrPrintf(&pszTmp[cchFilename + cchSuffix], 16 + 1, ".%u", uMajorVer);
+                rc = RTLdrLoadEx(pszTmp, phLdrMod, fFlags, NULL);
+                if (RT_SUCCESS(rc))
+                    break;
+            }
+        }
+    }
+#endif
+
+    return rc;
 }
 

trunk/src/VBox/Runtime/r3/posix/process-creation-posix.cpp

@@ -204 +204 @@
         return pfnCryptR(pszKey, pszSalt, pData);
 
-    pfnCryptR = (PFNCRYPTR)(uintptr_t)RTLdrGetSystemSymbol("libcrypt.so", "crypt_r");
+    pfnCryptR = (PFNCRYPTR)(uintptr_t)RTLdrGetSystemSymbolEx("libcrypt.so", "crypt_r", RTLDRLOAD_FLAGS_SO_VER_RANGE(1, 6));
     if (!pfnCryptR)
-        pfnCryptR = (PFNCRYPTR)(uintptr_t)RTLdrGetSystemSymbol("libxcrypt.so", "crypt_r");
+        pfnCryptR = (PFNCRYPTR)(uintptr_t)RTLdrGetSystemSymbolEx("libxcrypt.so", "crypt_r", RTLDRLOAD_FLAGS_SO_VER_RANGE(1, 32));
     if (pfnCryptR)
     {