Changeset 51523 in vbox for trunk/src/VBox

Timestamp:

Jun 4, 2014 7:58:33 AM (11 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxService: fix an assertion getting network interface information on 64-bit Linux guests.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -1157 +1157 @@
     while (cbLeft >= sizeof(*pCur))
     {
+# if defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX)
+        /* These two do not provide the sa_len member but only support address
+         * families which do not need extra bytes on the end. */
+#  define SA_LEN(pAddr) sizeof(struct sockaddr)
+# elif !defined(SA_LEN)
+#  define SA_LEN(pAddr) (pAddr)->sa_len
+# endif
         /* Figure the size of the current request. */
-        size_t cbCur = RT_OFFSETOF(struct ifreq, ifr_addr);
-# if defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX) /* No sa_len on this platforms. */
+        size_t cbCur = RT_OFFSETOF(struct ifreq, ifr_addr)
+                     + SA_LEN(&pCur->ifr_addr);
+        cbCur = RT_MAX(cbCur, sizeof(struct ifreq));
+# if defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX)
         Assert(pCur->ifr_addr.sa_family == AF_INET);
-        cbCur += sizeof(struct sockaddr);
-# else
-        cbCur += RT_MAX(sizeof(struct sockaddr), pCur->ifr_addr.sa_len);
 # endif
         AssertBreak(cbCur <= cbLeft);