Changeset 23068 in vbox for trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c

Timestamp:

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

Author:

vboxsync

Message:

VBoxNetAdp: ioctl cleanup.

File:

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

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;
 }