Changeset 23136 in vbox for trunk/src/VBox

Timestamp:

Sep 18, 2009 2:22:28 PM (15 years ago)

Author:

vboxsync

Message:

NetIf-darwin.cpp: Corrected search search on BSD name in the list returned by DarwinGetEthernetControllers: Use the right length, sdl_nlen instead of sdl_len. And, sdl_data isn't null terminated but szBSDName is, so we have to check that the latter is terminated where we stopped comparing.

File:

• trunk/src/VBox/Main/darwin/NetIf-darwin.cpp (modified) (6 diffs)

trunk/src/VBox/Main/darwin/NetIf-darwin.cpp

@@ -171 +171 @@
 
         pAddresses[i] = sa;
-        
+
         ADVANCE(cp, sa);
     }
@@ -180 +180 @@
     struct sockaddr *addresses[RTAX_MAX];
 
-    extractAddresses(iAddrMask, cp, cplim, addresses); 
+    extractAddresses(iAddrMask, cp, cplim, addresses);
     switch (addresses[RTAX_IFA]->sa_family)
     {
@@ -213 +213 @@
     int aiMib[6];
     struct sockaddr *addresses[RTAX_MAX];
-    
+
     aiMib[0] = CTL_NET;
     aiMib[1] = PF_ROUTE;
@@ -335 +335 @@
 
         size_t cbNameLen = pSdl->sdl_nlen + 1;
+        Assert(pSdl->sdl_nlen < sizeof(pNIC->szBSDName));
         for (pNIC = pEtherNICs; pNIC; pNIC = pNIC->pNext)
-            if (!strncmp(pSdl->sdl_data, pNIC->szBSDName, pSdl->sdl_len))
+            if (   !strncmp(pSdl->sdl_data, pNIC->szBSDName, pSdl->sdl_nlen)
+                && pNIC->szBSDName[pSdl->sdl_nlen] == '\0')
             {
                 cbNameLen = strlen(pEtherNICs->szName) + 1;
@@ -349 +351 @@
         memcpy(pNew->MACAddress.au8, LLADDR(pSdl), sizeof(pNew->MACAddress.au8));
         pNew->enmMediumType = NETIF_T_ETHERNET;
-        Assert(sizeof(pNew->szShortName) >= cbNameLen);
-        memcpy(pNew->szShortName, pSdl->sdl_data, pSdl->sdl_nlen);
+        Assert(sizeof(pNew->szShortName) > pSdl->sdl_nlen);
+        memcpy(pNew->szShortName, pSdl->sdl_data, RT_MIN(pSdl->sdl_nlen, sizeof(pNew->szShortName) - 1));
+
         /*
          * If we found the adapter in the list returned by
@@ -433 +436 @@
     char *pBuf, *pNext;
     int aiMib[6];
-    
+
     aiMib[0] = CTL_NET;
     aiMib[1] = PF_ROUTE;