Changeset 23048 in vbox for trunk/src

Timestamp:

Sep 15, 2009 11:21:32 PM (15 years ago)

Author:

vboxsync

Message:

VBoxNetAdpCtl.cpp: Fix for execv/dup2 failure path in the child.

File:

• trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp (modified) (3 diffs)

trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp

@@ -130 +130 @@
     if (pid == 0)
     {
+        /* child */
         close(fds[0]);
         close(STDOUT_FILENO);
@@ -135 +136 @@
         if (rc >= 0)
             execve(VBOXADPCTL_IFCONFIG_PATH, argv, envp);
-    }
-    else
-    {
-        close(fds[1]);
-        FILE *fp = fdopen(fds[0], "r");
-        if (!fp)
+        return false;
+    }
+
+    /* parent */
+    close(fds[1]);
+    FILE *fp = fdopen(fds[0], "r");
+    if (!fp)
+        return false;
+
+    int cAddrs;
+    for (cAddrs = 0; cAddrs < MAX_ADDRESSES && fgets(szBuf, sizeof(szBuf), fp);)
+    {
+        int cbSkipWS = strspn(szBuf, " \t");
+#if 0 /* Don't use this! assert() breaks the mac build. Use IPRT or be a rectangular building thing. */
+        assert(cbSkipWS < 20);
+#endif
+        char *pszWord = strtok(szBuf + cbSkipWS, " ");
+        /* We are concerned with IPv6 address lines only. */
+        if (!pszWord || strcmp(pszWord, "inet6"))
+            continue;
+#ifdef RT_OS_LINUX
+        pszWord = strtok(NULL, " ");
+        /* Skip "addr:". */
+        if (!pszWord || strcmp(pszWord, "addr:"))
+            continue;
+#endif
+        pszWord = strtok(NULL, " ");
+        /* Skip link-local addresses. */
+        if (!pszWord || !strncmp(pszWord, "fe80", 4))
+            continue;
+        strncpy(aszAddresses[cAddrs++], pszWord, MAX_ADDRLEN-1);
+    }
+    fclose(fp);
+
+    for (int i = 0; i < cAddrs; i++)
+    {
+        if (executeIfconfig(pszAdapterName, "inet6",
+                            VBOXADPCTL_DEL_CMD, aszAddresses[i]) != EXIT_SUCCESS)
             return false;
-
-        int cAddrs;
-        for (cAddrs = 0; cAddrs < MAX_ADDRESSES && fgets(szBuf, sizeof(szBuf), fp);)
-        {
-            int cbSkipWS = strspn(szBuf, " \t");
-#if 0 /* Don't use this! assert() breaks the mac build. Use IPRT or be a rectangular building thing. */
-            assert(cbSkipWS < 20);
-#endif
-            char *pszWord = strtok(szBuf + cbSkipWS, " ");
-            /* We are concerned with IPv6 address lines only. */
-            if (!pszWord || strcmp(pszWord, "inet6"))
-                continue;
-#ifdef RT_OS_LINUX
-            pszWord = strtok(NULL, " ");
-            /* Skip "addr:". */
-            if (!pszWord || strcmp(pszWord, "addr:"))
-                continue;
-#endif
-            pszWord = strtok(NULL, " ");
-            /* Skip link-local addresses. */
-            if (!pszWord || !strncmp(pszWord, "fe80", 4))
-                continue;
-            strncpy(aszAddresses[cAddrs++], pszWord, MAX_ADDRLEN-1);
-        }
-        fclose(fp);
-
-        for (int i = 0; i < cAddrs; i++)
-        {
-            if (executeIfconfig(pszAdapterName, "inet6",
-                                VBOXADPCTL_DEL_CMD, aszAddresses[i]) != EXIT_SUCCESS)
-                return false;
-        }
     }
 
@@ -191 +192 @@
     if (rc == -1)
     {
-        perror("VBoxNetAdpCtl: ioctl failed for " VBOXNETADP_CTL_DEV_NAME); 
+        perror("VBoxNetAdpCtl: ioctl failed for " VBOXNETADP_CTL_DEV_NAME);
         rc = ADPCTLERR_IOCTL_FAILED;
     }
-    
+
     close(fd);
- 
+
     return rc;
 }