儲存庫 vbox 的更動 13788

時間撮記:

2008-11-4 下午03:22:30 (16 年 以前)

作者:

vboxsync

訊息:

added (still disabled) code for additional security checks in /tmp/.vbox-*-ipc

檔案:

• trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp (修改) (4 筆差異)

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp

@@ -94 +94 @@
     ELockFileOpen = -1,
     ELockFileLock = -2,
-
+    ELockFileOwner = -3,
 };
 
@@ -113 +113 @@
     memcpy(lockFile + dirLen + 1, lockName, sizeof(lockName));
 
+#if 0
+#ifdef VBOX
+    //
+    // Security checks
+    //
+    struct stat st;
+    if (stat(baseDir, &st) == -1)
+    {
+        printf("Cannot stat '%s'.\n", baseDir);
+        return ELockFileOwner;
+    }
+
+    if (st.st_uid != getuid() && st.st_uid != geteuid())
+    {
+        printf("Wrong owner (%d) of '%s'.\n", st.st_uid, baseDir);
+        return ELockFileOwner;
+    }
+
+    if (st.st_mode != (__S_IREAD | __S_IWRITE | __S_IEXEC | __S_IFDIR))
+    {
+        printf("Wrong mode (%o) of '%s'.\n", st.st_mode, baseDir);
+        return ELockFileOwner;
+    }
+#endif
+#endif
+
     //
     // open lock file.  it remains open until we shutdown.
@@ -118 +144 @@
     ipcLockFD = open(lockFile, O_WRONLY|O_CREAT, S_IWUSR|S_IRUSR);
 
+#if 0
+#ifndef VBOX
     free(lockFile);
+#endif
+#endif
 
     if (ipcLockFD == -1)
         return ELockFileOpen;
+
+#if 0
+#ifdef VBOX
+    //
+    // Security checks
+    //
+    if (fstat(ipcLockFD, &st) == -1)
+    {
+        printf("Cannot stat '%s'.\n", lockFile);
+        free(lockFile);
+        return ELockFileOwner;
+    }
+
+    if (st.st_uid != getuid() && st.st_uid != geteuid())
+    {
+        printf("Wrong owner (%d) of '%s'.\n", st.st_uid, lockFile);
+        free(lockFile);
+        return ELockFileOwner;
+    }
+
+    if (st.st_mode != (__S_IREAD | __S_IWRITE | __S_IFREG))
+    {
+        printf("Wrong mode (%o) of '%s'.\n", st.st_mode, lockFile);
+        free(lockFile);
+        return ELockFileOwner;
+    }
+
+    free(lockFile);
+#endif
+#endif
 
     //
@@ -434 +494 @@
             // we terminate
 #ifdef VBOX
-            printf("Cannot create a lock file for '%s'.\n"
-                   "Check permissions.\n", addr.local.path);
+            if (status != ELockFileOwner)
+                printf("Cannot create a lock file for '%s'.\n"
+                        "Check permissions.\n", addr.local.path);
 #endif
             return 0;