Changeset 33100 in vbox for trunk

Timestamp:

Oct 13, 2010 12:09:23 PM (14 years ago)

Author:

vboxsync

Message:

Main/linux/USB enumeration: set close-on-exec and close files

Location:

trunk/src/VBox/Main/linux

Files:

• HostHardwareLinux.cpp (modified) (2 diffs)
• USBGetDevices.cpp (modified) (4 diffs)
• USBProxyServiceLinux.cpp (modified) (2 diffs)

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -1123 +1123 @@
     flags = fcntl(fd, F_GETFL, NULL);
     if (   flags < 0
-        || fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0)
+        || fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0
+        || fcntl(fd, F_SETFD, FD_CLOEXEC) < 0 /* race here */)
     {
         Assert(errno > 0);
@@ -1227 +1228 @@
 
     /*
-     * Create the pipe and set the close-on-exec flag if requested.
+     * Create the pipe and set the close-on-exec flag.
      */
     int aFds[2] = {-1, -1};
     if (pipe(aFds))
         return RTErrConvertFromErrno(errno);
+    if (   fcntl(aFds[0], F_SETFD, FD_CLOEXEC) < 0
+        || fcntl(aFds[1], F_SETFD, FD_CLOEXEC) < 0)
+    {
+        int rc = RTErrConvertFromErrno(errno);
+        close(aFds[0]);
+        close(aFds[1]);
+        return rc;
+    }
 
     *phPipeRead  = aFds[0];

trunk/src/VBox/Main/linux/USBGetDevices.cpp

@@ -93 +93 @@
 int USBProxyLinuxCheckForUsbfs(const char *pcszDevices)
 {
-    int fd;
+    int fd, rc = VINF_SUCCESS;
 
     fd = open(pcszDevices, O_RDONLY, 00600);
-    if (fd)
+    if (fd >= 0)
     {
         /*
@@ -104 +104 @@
         if (!fstatfs(fd, &StFS))
         {
-            if (StFS.f_type == USBDEVICE_SUPER_MAGIC)
-                return VINF_SUCCESS;
-            else
-                return VERR_NOT_FOUND;
+            if (StFS.f_type != USBDEVICE_SUPER_MAGIC)
+                rc = VERR_NOT_FOUND;
         }
         else
-            return RTErrConvertFromErrno(errno);
+            rc = RTErrConvertFromErrno(errno);
+        close(fd);
     }
     else
-        return RTErrConvertFromErrno(errno);
-    return 0;
+        rc = RTErrConvertFromErrno(errno);
+    return rc;
 }
 
@@ -548 +547 @@
         Dev.enmState = USBDEVICESTATE_UNUSED;
 
-        rc = VINF_SUCCESS;
+        /* Set close on exit and hope no one is racing us. */
+        rc =   fcntl(fileno(pFile), F_SETFD, FD_CLOEXEC) >= 0
+             ? VINF_SUCCESS
+             : RTErrConvertFromErrno(errno);
         while (     RT_SUCCESS(rc)
                &&   fgets(szLine, sizeof(szLine), pFile))
@@ -781 +783 @@
 #undef PREFIX
         } /* parse loop */
+        fclose(pFile);
 
         /*

trunk/src/VBox/Main/linux/USBProxyServiceLinux.cpp

@@ -45 +45 @@
 #include <stdio.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <sys/statfs.h>
@@ -181 +182 @@
                 if (!pipe(pipes))
                 {
-                    mWakeupPipeR = pipes[0];
-                    mWakeupPipeW = pipes[1];
-                    /*
-                     * Start the poller thread.
-                     */
-                    rc = start();
-                    if (RT_SUCCESS(rc))
+                    /* Set close on exec (race here!) */
+                    if (   fcntl(pipes[0], F_SETFD, FD_CLOEXEC) >= 0
+                        && fcntl(pipes[1], F_SETFD, FD_CLOEXEC) >= 0)
                     {
-                        RTStrFree(pszDevices);
-                        LogFlowThisFunc(("returns successfully - mWakeupPipeR/W=%d/%d\n",
-                                         mWakeupPipeR, mWakeupPipeW));
-                        return VINF_SUCCESS;
+                        mWakeupPipeR = pipes[0];
+                        mWakeupPipeW = pipes[1];
+                        /*
+                         * Start the poller thread.
+                         */
+                        rc = start();
+                        if (RT_SUCCESS(rc))
+                        {
+                            RTStrFree(pszDevices);
+                            LogFlowThisFunc(("returns successfully - mWakeupPipeR/W=%d/%d\n",
+                                             mWakeupPipeR, mWakeupPipeW));
+                            return VINF_SUCCESS;
+                        }
+
+                        RTFileClose(mWakeupPipeR);
+                        RTFileClose(mWakeupPipeW);
+                        mWakeupPipeW = mWakeupPipeR = NIL_RTFILE;
                     }
-
-                    RTFileClose(mWakeupPipeR);
-                    RTFileClose(mWakeupPipeW);
-                    mWakeupPipeW = mWakeupPipeR = NIL_RTFILE;
+                    else
+                    {
+                        rc = RTErrConvertFromErrno(errno);
+                        Log(("USBProxyServiceLinux::USBProxyServiceLinux: fcntl failed, errno=%d\n", errno));
+                        close(pipes[0]);
+                        close(pipes[1]);
+                    }
                 }
                 else