Changeset 31555 in vbox

Timestamp:

Aug 11, 2010 7:14:37 AM (14 years ago)

Author:

vboxsync

Message:

vboxnetadp: sanity check for dev->dev_addr

File:

• trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c

@@ -177 +177 @@
         int err;
 
-        memcpy(pNetDev->dev_addr, pMACAddress, ETH_ALEN);
-        Log2(("vboxNetAdpOsCreate: pNetDev->dev_addr = %.6Rhxd\n", pNetDev->dev_addr));
-        err = register_netdev(pNetDev);
-        if (!err)
+        if (pNetDev->dev_addr)
         {
-            strncpy(pThis->szName, pNetDev->name, VBOXNETADP_MAX_NAME_LEN);
-            pThis->u.s.pNetDev = pNetDev;
-            Log2(("vboxNetAdpOsCreate: pThis=%p pThis->szName = %p\n", pThis, pThis->szName));
-            return VINF_SUCCESS;
+            memcpy(pNetDev->dev_addr, pMACAddress, ETH_ALEN);
+            Log2(("vboxNetAdpOsCreate: pNetDev->dev_addr = %.6Rhxd\n", pNetDev->dev_addr));
+            err = register_netdev(pNetDev);
+            if (!err)
+            {
+                strncpy(pThis->szName, pNetDev->name, VBOXNETADP_MAX_NAME_LEN);
+                pThis->u.s.pNetDev = pNetDev;
+                Log2(("vboxNetAdpOsCreate: pThis=%p pThis->szName = %p\n", pThis, pThis->szName));
+                return VINF_SUCCESS;
+            }
+        }
+        else
+        {
+            LogRel(("VBoxNetAdp: failed to set MAC address (dev->dev_addr == NULL)\n"));
+            err = EFAULT;
         }
         free_netdev(pNetDev);
@@ -361 +369 @@
     }
     else
-        LogRel(("VBoxNetFlt: failed to initialize IPRT (rc=%d)\n", rc));
+        LogRel(("VBoxNetAdp: failed to initialize IPRT (rc=%d)\n", rc));
 
     return -RTErrConvertToErrno(rc);