Changeset 23068 in vbox for trunk/src/VBox/HostDrivers/VBoxNetAdp

Timestamp:

Sep 16, 2009 12:59:18 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52402

Message:

VBoxNetAdp: ioctl cleanup.

Location:

trunk/src/VBox/HostDrivers/VBoxNetAdp

Files:

• VBoxNetAdp.c (modified) (1 diff)
• darwin/VBoxNetAdp-darwin.cpp (modified) (2 diffs)
• freebsd/VBoxNetAdp-freebsd.c (modified) (3 diffs)
• linux/VBoxNetAdp-linux.c (modified) (2 diffs)

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

@@ -1232 +1232 @@
         PVBOXNETADP pThis = &g_aAdapters[i];
         Log2(("VBoxNetAdp: Scanning entry: state=%d name=%s\n", pThis->enmState, pThis->szName));
-        if (strncmp(pThis->szName, pszName, VBOXNETADP_MAX_NAME_LEN) == 0)
-            if (ASMAtomicReadU32((uint32_t volatile *)&pThis->enmState) == kVBoxNetAdpState_Active)
-                return pThis;
+        if (   strcmp(pThis->szName, pszName) == 0
+            && ASMAtomicReadU32((uint32_t volatile *)&pThis->enmState) == kVBoxNetAdpState_Active)
+            return pThis;
     }
     return NULL;

trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp

@@ -867 +867 @@
 static int VBoxNetAdpDarwinIOCtl(dev_t Dev, u_long iCmd, caddr_t pData, int fFlags, struct proc *pProcess)
 {
-    int rc = VINF_SUCCESS;
     uint32_t cbReq = IOCPARM_LEN(iCmd);
     PVBOXNETADPREQ pReq = (PVBOXNETADPREQ)pData;
+    int rc;
 
     Log(("VBoxNetAdpDarwinIOCtl: param len %#x; iCmd=%#lx\n", cbReq, iCmd));
@@ -875 +875 @@
     {
         case IOCBASECMD(VBOXNETADP_CTL_ADD):
-            if ((IOC_DIRMASK & iCmd) == IOC_OUT)
-            {
-                PVBOXNETADP pNew;
-                rc = vboxNetAdpCreate(&pNew);
-                if (RT_SUCCESS(rc))
-                {
-                    if (cbReq < sizeof(VBOXNETADPREQ))
-                    {
-                        OSDBGPRINT(("VBoxNetAdpDarwinIOCtl: param len %#x < req size %#x; iCmd=%#lx\n", cbReq, sizeof(VBOXNETADPREQ), iCmd));
-                        return EINVAL;
-                    }
-                    strncpy(pReq->szName, pNew->szName, sizeof(pReq->szName));
-                }
-            }
+        {
+            if (   (IOC_DIRMASK & iCmd) != IOC_OUT
+                || cbReq < sizeof(VBOXNETADPREQ))
+                return EINVAL;
+
+            PVBOXNETADP pNew;
+            rc = vboxNetAdpCreate(&pNew);
+            if (RT_FAILURE(rc))
+                return EINVAL;
+
+            Assert(strlen(pReq->szName) < sizeof(pReq->szName));
+            strncpy(pReq->szName, pNew->szName, sizeof(pReq->szName) - 1);
+            pReq->szName[sizeof(pReq->szName) - 1] = '\0';
+            Log(("VBoxNetAdpDarwinIOCtl: Added '%s'\n", pReq->szName));
             break;
+        }
 
         case IOCBASECMD(VBOXNETADP_CTL_REMOVE):
-            for (unsigned i = 0; i < RT_ELEMENTS(g_aAdapters); i++)
-            {
-                PVBOXNETADP pThis = &g_aAdapters[i];
-                rc = VERR_NOT_FOUND;
-                if (strncmp(pThis->szName, pReq->szName, VBOXNETADP_MAX_NAME_LEN) == 0)
-                    if (ASMAtomicReadU32((uint32_t volatile *)&pThis->enmState) == kVBoxNetAdpState_Active)
-                    {
-                        rc = vboxNetAdpDestroy(pThis);
-                        break;
-                    }
-            }
+        {
+            if (!memchr(pReq->szName, '\0', RT_MIN(cbReq, sizeof(pReq->szName))))
+                return EINVAL;
+
+            PVBOXNETADP pAdp = vboxNetAdpFindByName(pReq->szName);
+            if (!pAdp)
+                return EINVAL;
+
+            rc = vboxNetAdpDestroy(pAdp);
+            if (RT_FAILURE(rc))
+                return EINVAL;
+            Log(("VBoxNetAdpDarwinIOCtl: Removed %s\n", pReq->szName));
             break;
+        }
+
         default:
             OSDBGPRINT(("VBoxNetAdpDarwinIOCtl: unknown command %x.\n", IOCBASECMD(iCmd)));
-            rc = VERR_INVALID_PARAMETER;
-            break;
-    }
-
-    return RT_SUCCESS(rc) ? 0 : EINVAL;
+            return EINVAL;
+    }
+
+    return 0;
 }
 

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

@@ -121 +121 @@
                 return RTErrConvertToErrno(rc);
             }
-            /* Create dev node */ 
+            /* Create dev node */
             VBoxNetAdpFreeBSDcdev = make_dev(&vboxnetadp_cdevsw, 0,
                 UID_ROOT, GID_WHEEL, 0600, VBOXNETADP_CTL_DEV_NAME);
@@ -149 +149 @@
 VBoxNetAdpFreeBSDCtrlioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td)
 {
-    PVBOXNETADP pAdp = NULL;
+    PVBOXNETADP pAdp;
     PVBOXNETADPREQ pReq = (PVBOXNETADPREQ)data;
     struct ifnet *ifp;
@@ -157 +157 @@
     {
         case VBOXNETADP_CTL_ADD:
-            if (!(cmd & IOC_OUT))
-                return (EINVAL);
+            if (   !(cmd & IOC_OUT)   /* paranoia*/
+                || IOCPARM_LEN(iCmd) < sizeof(*pReq))
+                return EINVAL;
 
             rc = vboxNetAdpCreate(&pAdp);
             if (RT_FAILURE(rc))
-                return (EINVAL);
-
-            strncpy(pReq->szName, pAdp->szName, sizeof(pReq->szName));
-            break;
+                return EINVAL;
+
+            strncpy(pReq->szName, pAdp->szName, sizeof(pReq->szName) - 1);
+            pReq->szName[sizeof(pReq->szName) - 1] = '\0';
+            break;
+
         case VBOXNETADP_CTL_REMOVE:
+            if (!memchr(pReq->szName, '\0', RT_MIN(sizeof(pReq->szName), IOCPARM_LEN(iCmd))))
+                return EINVAL;
+
             pAdp = vboxNetAdpFindByName(pReq->szName);
-            if (pAdp)
-                rc = vboxNetAdpDestroy(pAdp);
-            else
-                return (EINVAL);
-
-            if (RT_FAILURE(rc))
-                return (EINVAL);
-
-            break;
+            if (!pAdp)
+                return EINVAL;
+
+            rc = vboxNetAdpDestroy(pAdp);
+            if (RT_FAILURE(rc))
+                return EINVAL;
+
+            break;
+
         default:
-            return (EINVAL);
+            return EINVAL;
     }
     return 0;

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

@@ -257 +257 @@
 {
     VBOXNETADPREQ Req;
-    PVBOXNETADP pAdp = NULL;
-    int rc = VINF_SUCCESS;
-    uint32_t cbReq =  _IOC_SIZE(uCmd);
-
-    Log(("VBoxNetAdpLinuxIOCtl: param len %#x; uCmd=%#x; add=%#x\n", cbReq, uCmd, VBOXNETADP_CTL_ADD));
-    if (RT_UNLIKELY(_IOC_SIZE(uCmd) != sizeof(Req)))
-    {
-        Log(("VBoxNetAdpLinuxIOCtl: bad ioctl sizeof(Req)=%#x _IOC_SIZE=%#x; uCmd=%#x.\n", sizeof(Req), cbReq, uCmd));
+    PVBOXNETADP pAdp;
+    int rc;
+
+    Log(("VBoxNetAdpLinuxIOCtl: param len %#x; uCmd=%#x; add=%#x\n", _IOC_SIZE(uCmd), uCmd, VBOXNETADP_CTL_ADD));
+    if (RT_UNLIKELY(_IOC_SIZE(uCmd) != sizeof(Req))) /* paraonia */
+    {
+        Log(("VBoxNetAdpLinuxIOCtl: bad ioctl sizeof(Req)=%#x _IOC_SIZE=%#x; uCmd=%#x.\n", sizeof(Req), _IOC_SIZE(uCmd), uCmd));
         return -EINVAL;
     }
+
     switch (uCmd)
     {
         case VBOXNETADP_CTL_ADD:
             Log(("VBoxNetAdpLinuxIOCtl: _IOC_DIR(uCmd)=%#x; IOC_OUT=%#x\n", _IOC_DIR(uCmd), IOC_OUT));
-            if (uCmd & IOC_OUT)
-            {
-                rc = vboxNetAdpCreate(&pAdp);
-                if (RT_SUCCESS(rc))
-                {
-                    if (cbReq < sizeof(VBOXNETADPREQ))
-                    {
-                        printk(KERN_ERR "VBoxNetAdpLinuxIOCtl: param len %#x < req size %#zx; uCmd=%#x\n", cbReq, sizeof(VBOXNETADPREQ), uCmd);
-                        return -EINVAL;
-                    }
-                    strncpy(Req.szName, pAdp->szName, sizeof(Req.szName));
-                    if (RT_UNLIKELY(copy_to_user((void *)ulArg, &Req, sizeof(Req))))
-                    {
-                        /* this is really bad! */
-                        printk(KERN_ERR "VBoxNetAdpLinuxIOCtl: copy_to_user(%#lx,,%#zx); uCmd=%#x!\n", ulArg, sizeof(Req), uCmd);
-                        rc = -EFAULT;
-                    }
-                }
-            }
+            rc = vboxNetAdpCreate(&pAdp);
+            if (RT_FAILURE(rc))
+            {
+                Log(("VBoxNetAdpLinuxIOCtl: vboxNetAdpCreate -> %Rrc\n", rc));
+                return -EINVAL;
+            }
+
+            Assert(strlen(pAdp->szName) < sizeof(Req.szName));
+            strncpy(Req.szName, pAdp->szName, sizeof(Req.szName) - 1);
+            Req.szName[sizeof(Req.szName) - 1] = '\0';
+
+            if (RT_UNLIKELY(copy_to_user((void *)ulArg, &Req, sizeof(Req))))
+            {
+                /* this is really bad! */
+                /** @todo remove the adapter again? */
+                printk(KERN_ERR "VBoxNetAdpLinuxIOCtl: copy_to_user(%#lx,,%#zx); uCmd=%#x!\n", ulArg, sizeof(Req), uCmd);
+                return -EFAULT;
+            }
+            Log(("VBoxNetAdpLinuxIOCtl: Successfully added '%s'\n", Req.szName));
             break;
 
@@ -299 +299 @@
             }
             Log(("VBoxNetAdpLinuxIOCtl: Remove %s\n", Req.szName));
+
             pAdp = vboxNetAdpFindByName(Req.szName);
-            if (pAdp)
-                rc = vboxNetAdpDestroy(pAdp);
-            else
-                rc = VERR_NOT_FOUND;
+            if (!pAdp)
+            {
+                Log(("VBoxNetAdpLinuxIOCtl: '%s' not found\n", Req.szName));
+                return -EINVAL;
+            }
+
+            rc = vboxNetAdpDestroy(pAdp);
+            if (RT_FAILURE(rc))
+            {
+                Log(("VBoxNetAdpLinuxIOCtl: vboxNetAdpDestroy('%s') -> %Rrc\n", Req.szName, rc));
+                return -EINVAL;
+            }
+            Log(("VBoxNetAdpLinuxIOCtl: Successfully removed '%s'\n", Req.szName));
             break;
 
         default:
             printk(KERN_ERR "VBoxNetAdpLinuxIOCtl: unknown command %x.\n", uCmd);
-            rc = VERR_INVALID_PARAMETER;
-            break;
-    }
-
-    Log(("VBoxNetAdpLinuxIOCtl: rc=%Vrc\n", rc));
-    return RT_SUCCESS(rc) ? 0 : -EINVAL;
+            return -EINVAL;
+    }
+
+    return 0;
 }