Changeset 43668 in vbox for trunk/src/VBox/Main/src-server/linux

Timestamp:

Oct 17, 2012 12:24:13 PM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Fix for file descriptor leak in getInterfaceInfo()

File:

• trunk/src/VBox/Main/src-server/linux/NetIf-linux.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/linux/NetIf-linux.cpp

@@ -150 +150 @@
         }
         /*
-         * I wish I could do simple ioctl here, but older kernels require root
-         * privileges for any ethtool commands.
+         * Don't even try to get speed for non-Ethernet interfaces, it only
+         * produces errors.
          */
-        char szBuf[256];
-        /* First, we try to retrieve the speed via sysfs. */
-        RTStrPrintf(szBuf, sizeof(szBuf), "/sys/class/net/%s/speed", pszName);
-        fp = fopen(szBuf, "r");
-        if (fp && fscanf(fp, "%u", &pInfo->uSpeedMbits) == 1)
-            fclose(fp);
-        else
-        {
-            /* Failed to get speed via sysfs, go to plan B. */
-            int rc = NetIfAdpCtlOut(pszName, "speed", szBuf, sizeof(szBuf));
-            if (RT_SUCCESS(rc))
-                pInfo->uSpeedMbits = RTStrToUInt32(szBuf);
-            else
-                pInfo->uSpeedMbits = 0;
+        pInfo->uSpeedMbits = 0;
+        if (pInfo->enmMediumType == NETIF_T_ETHERNET)
+        {
+            /*
+             * I wish I could do simple ioctl here, but older kernels require root
+             * privileges for any ethtool commands.
+             */
+            char szBuf[256];
+            /* First, we try to retrieve the speed via sysfs. */
+            RTStrPrintf(szBuf, sizeof(szBuf), "/sys/class/net/%s/speed", pszName);
+            fp = fopen(szBuf, "r");
+            if (fp)
+            {
+                if (fscanf(fp, "%u", &pInfo->uSpeedMbits) != 1)
+                    pInfo->uSpeedMbits = 0;
+                fclose(fp);
+            }
+            if (pInfo->uSpeedMbits == 0)
+            {
+                /* Failed to get speed via sysfs, go to plan B. */
+                int rc = NetIfAdpCtlOut(pszName, "speed", szBuf, sizeof(szBuf));
+                if (RT_SUCCESS(rc))
+                    pInfo->uSpeedMbits = RTStrToUInt32(szBuf);
+            }
         }
     }