Changeset 6948 in vbox

Timestamp:

Feb 14, 2008 1:16:01 PM (17 years ago)

Author:

vboxsync

Message:

Additions/Linux: fixed a copy_to_user/copy_from_user mixmatch in VBOXGUEST_IOCTL_CTL_FILTER_MASK and cleaned up slightly

File:

• trunk/src/VBox/Additions/linux/module/vboxmod.c (modified) (3 diffs)

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -321 +321 @@
 static int vboxadd_control_filter_mask(VBoxGuestFilterMaskInfo *pInfo)
 {
-    VMMDevCtlGuestFilterMask *pReq;
+    VMMDevCtlGuestFilterMask *pReq = NULL;
     int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_CtlGuestFilterMask);
+
+    LogFlow(("VBoxGuestCommonIOCtl: CTL_FILTER_MASK: request received, u32OrMask=0x%x, u32NotMask=0x%x\n", pInfo->u32OrMask, pInfo->u32NotMask));
     if (RT_FAILURE(rc))
-    {
-        Log(("VBoxGuestCommonIOCtl: CTL_FILTER_MASK: failed to allocate %u (%#x) bytes to cache the request. rc=%d!!\n",
-             sizeof(*pReq), sizeof(*pReq), rc));
-        return rc;
-    }
-
-    pReq->u32OrMask = pInfo->u32OrMask;
-    pReq->u32NotMask = pInfo->u32NotMask;
-
-    rc = VbglGRPerform(&pReq->header);
+        Log(("VBoxGuestCommonIOCtl: CTL_FILTER_MASK: failed to allocate %u (%#x) bytes to cache the request. rc=%d!!\n", sizeof(*pReq), sizeof(*pReq), rc));
+    else
+    {
+        pReq->u32OrMask = pInfo->u32OrMask;
+        pReq->u32NotMask = pInfo->u32NotMask;
+        rc = VbglGRPerform(&pReq->header);
+    }
     if (RT_FAILURE(rc))
         Log(("VBoxGuestCommonIOCtl: CTL_FILTER_MASK: VbglGRPerform failed, rc=%Rrc!\n", rc));
@@ -341 +340 @@
         rc = pReq->header.rc;
     }
-
-    VbglGRFree(&pReq->header);
+    if (pReq)
+        VbglGRFree(&pReq->header);
     return rc;
 }
@@ -483 +482 @@
         {
                 VBoxGuestFilterMaskInfo info;
-                if (copy_to_user((void*)arg, (void*)&info, sizeof(info)))
+                if (copy_from_user((void*)&info, (void*)arg, sizeof(info)))
                 {
                     LogRelFunc(("VBOXGUEST_IOCTL_CTL_FILTER_MASK: error getting parameters from user space!\n"));