Changeset 25558 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Dec 22, 2009 12:45:27 PM (15 years ago)

Author:

vboxsync

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

56235

Message:

FreeBSD/iprt,suplib: Review and cleanup of r56138. Hope it compiles...

File:

• trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp (modified) (3 diffs)

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

@@ -141 +141 @@
 #endif
 
+
 /*******************************************************************************
 *   Internal Functions                                                         *
@@ -324 +325 @@
 # ifdef RT_OS_LINUX
     int cchLink = readlink("/proc/self/exe", &g_szSupLibHardenedExePath[0], sizeof(g_szSupLibHardenedExePath) - 1);
+
 # elif defined(RT_OS_SOLARIS)
     char szFileBuf[PATH_MAX + 1];
     sprintf(szFileBuf, "/proc/%ld/path/a.out", (long)getpid());
     int cchLink = readlink(szFileBuf, &g_szSupLibHardenedExePath[0], sizeof(g_szSupLibHardenedExePath) - 1);
-# else /* RT_OS_FREEBSD: */
+
+# else /* RT_OS_FREEBSD */
     int aiName[4];
-    size_t cbPath;
-
     aiName[0] = CTL_KERN;
     aiName[1] = KERN_PROC;
@@ -337 +338 @@
     aiName[3] = getpid();
 
-    cbPath = sizeof(g_szSupLibHardenedExePath) - 1;
-    if(sysctl(aiName, RT_ELEMENTS(aiName), g_szSupLibHardenedExePath, &cbPath, NULL, 0) < 0)
-       supR3HardenedFatal("supR3HardenedExecDir: sysctl failed\n");
-
-    int cchLink = strlen(g_szSupLibHardenedExePath);
+    size_t cbPath = sizeof(g_szSupLibHardenedExePath);
+    if (sysctl(aiName, RT_ELEMENTS(aiName), g_szSupLibHardenedExePath, &cbPath, NULL, 0) < 0)
+        supR3HardenedFatal("supR3HardenedExecDir: sysctl failed\n");
+    g_szSupLibHardenedExePath[sizeof(g_szSupLibHardenedExePath) - 1] = '\0';
+    int cchLink = strlen(g_szSupLibHardenedExePath); /* paranoid? can't we use cbPath? */
+
 # endif
     if (cchLink < 0 || cchLink == sizeof(g_szSupLibHardenedExePath) - 1)