Changeset 24821 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 20, 2009 1:33:26 PM (15 years ago)

Author:

vboxsync

Message:

xpcom/server.cpp: Close all file handles when daemonzining VBoxSVC.

File:

• trunk/src/VBox/Main/xpcom/server.cpp (modified) (14 diffs)

trunk/src/VBox/Main/xpcom/server.cpp

@@ -53 +53 @@
 
 #include <stdio.h>
-
-// for the signal handler
-#include <signal.h>
+#include <signal.h>     // for the signal handler
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <getopt.h>
-
+#include <sys/fcntl.h>
 #ifndef RT_OS_OS2
 # include <sys/resource.h>
@@ -748 +746 @@
     {
         { "automate",       no_argument,        NULL, 'a' },
-#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
         { "auto-shutdown",  no_argument,        NULL, 'A' },
-#endif
         { "daemonize",      no_argument,        NULL, 'd' },
         { "pidfile",        required_argument,  NULL, 'p' },
-#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
         { "pipe",           required_argument,  NULL, 'P' },
-#endif
         { NULL,             0,                  NULL,  0  }
     };
-    int c;
-
+    int  c;
     bool fDaemonize = false;
-#ifndef RT_OS_OS2
-    static int daemon_pipe_fds[2] = {-1, -1};
-#endif
+    int  daemon_pipe_wr = -1;
 
     for (;;)
@@ -782 +773 @@
             }
 
-# if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
             /* Used together with '-P', see below. Internal use only. */
             case 'A':
@@ -789 +779 @@
                 break;
             }
-#endif
 
             case 'd':
@@ -803 +792 @@
             }
 
-# if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
             /* we need to exec on darwin, this is just an internal
              * hack for passing the pipe fd along to the final child. */
             case 'P':
             {
-                daemon_pipe_fds[1] = atoi(optarg);
+                daemon_pipe_wr = atoi(optarg);
                 break;
             }
-#endif
 
             default:
@@ -834 +821 @@
     {
         /* create a pipe for communication between child and parent */
+        int daemon_pipe_fds[2] = {-1, -1};
         if (pipe(daemon_pipe_fds) < 0)
         {
@@ -839 +827 @@
             return 1;
         }
+        daemon_pipe_wr = daemon_pipe_fds[1];
+        int daemon_pipe_rd = daemon_pipe_fds[0];
 
         pid_t childpid = fork();
@@ -853 +843 @@
 
             /* close the writing end of the pipe */
-            close(daemon_pipe_fds[1]);
+            close(daemon_pipe_wr);
 
             /* try to read a message from the pipe */
-            char msg[10] = {0}; /* initialize so it's NULL terminated */
-            if (read(daemon_pipe_fds[0], msg, sizeof(msg)) > 0)
+            char msg[10 + 1];
+            RT_ZERO(msg); /* initialize so it's NULL terminated */
+            if (read(daemon_pipe_rd, msg, sizeof(msg) - 1) > 0)
             {
                 if (strcmp(msg, "READY") == 0)
                     fSuccess = true;
                 else
-                    printf ("ERROR: Unknown message from child "
-                            "process (%s)\n", msg);
+                    printf ("ERROR: Unknown message from child process (%s)\n", msg);
             }
             else
@@ -869 +859 @@
 
             /* close the reading end of the pipe as well and exit */
-            close(daemon_pipe_fds[0]);
+            close(daemon_pipe_rd);
             return fSuccess ? 0 : 1;
         }
@@ -898 +888 @@
         }
 
-        /* Redirect standard i/o streams to /dev/null */
-        if (daemon_pipe_fds[0] > 2)
-        {
-            freopen ("/dev/null", "r", stdin);
-            freopen ("/dev/null", "w", stdout);
-            freopen ("/dev/null", "w", stderr);
-        }
-
-        /* close the reading end of the pipe */
-        close(daemon_pipe_fds[0]);
-
-# if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
+        /* Close all file handles except for the write end of the pipe. */
+        int fdMax;
+        struct rlimit lim;
+        if (getrlimit(RLIMIT_NOFILE, &lim) == 0)
+            fdMax = (int)RT_MIN(lim.rlim_cur, 65535); /* paranoia */
+        else
+            fdMax = 1024;
+        for (int fd = 0; fd < fdMax; fd++)
+            if (fd != daemon_pipe_wr)
+                close(fd);
+
+        /* Make sure the pipe isn't any of the standard handles. */
+        if (daemon_pipe_wr <= 2)
+        {
+            if (dup2(daemon_pipe_wr, 3) == 3)
+            {
+                close(daemon_pipe_wr);
+                daemon_pipe_wr = 3;
+            }
+        }
+
+        /* Redirect the standard handles to NULL by opening /dev/null three times. */
+        open("/dev/null", O_RDWR, 0);
+        open("/dev/null", O_RDWR, 0);
+        open("/dev/null", O_RDWR, 0);
+
         /*
          * On leopard we're no longer allowed to use some of the core API's
@@ -921 +925 @@
          * a frontend (debugger and strace don't contain any useful info).
          */
-        const char *apszArgs[7];
+        const char *apszArgs[7 + 2];
         unsigned i = 0;
         apszArgs[i++] = argv[0];
         apszArgs[i++] = "--pipe";
         char szPipeArg[32];
-        RTStrPrintf (szPipeArg, sizeof (szPipeArg), "%d", daemon_pipe_fds[1]);
+        RTStrPrintf (szPipeArg, sizeof (szPipeArg), "%d", daemon_pipe_wr);
         apszArgs[i++] = szPipeArg;
         if (pszPidFile)
@@ -938 +942 @@
         execv (apszArgs[0], (char * const *)apszArgs);
         exit (126);
-# endif
     }
 
@@ -1046 +1049 @@
         }
 
-#ifndef RT_OS_OS2
-        if (daemon_pipe_fds[1] >= 0)
+        if (daemon_pipe_wr >= 0)
         {
             printf ("\nStarting event loop....\n[send TERM signal to quit]\n");
             /* now we're ready, signal the parent process */
-            write(daemon_pipe_fds[1], "READY", strlen("READY"));
+            write(daemon_pipe_wr, "READY", strlen("READY"));
         }
         else
-#endif
         {
             printf ("\nStarting event loop....\n[press Ctrl-C to quit]\n");
@@ -1133 +1134 @@
     }
 
-#ifndef RT_OS_OS2
-    if (daemon_pipe_fds[1] >= 0)
+    if (daemon_pipe_wr >= 0)
     {
         /* close writing end of the pipe as well */
-        close(daemon_pipe_fds[1]);
-    }
-#endif
+        close(daemon_pipe_wr);
+    }
 
     return 0;