Changeset 10720 in vbox for trunk

Timestamp:

Jul 17, 2008 12:06:56 PM (16 years ago)

Author:

vboxsync

Message:

Fixed issue in fast (METHOD_NEITHER) ioctls.
Write the last error to pVM->vmm.s.iLastGCRc instead of writing it to a user buffer.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPLib.cpp (modified) (3 diffs)
• HostDrivers/Support/os2/SUPLib-os2.cpp (modified) (1 diff)
• HostDrivers/Support/win/SUPDrv-win.cpp (modified) (2 diffs)
• HostDrivers/Support/win/SUPLib-win.cpp (modified) (1 diff)
• VMM/VMM.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -524 +524 @@
 SUPR3DECL(int) SUPCallVMMR0Ex(PVMR0 pVMR0, unsigned uOperation, uint64_t u64Arg, PSUPVMMR0REQHDR pReqHdr)
 {
-#if 0 /* temp hack. */
     /*
      * The following operations don't belong here.
@@ -533 +532 @@
                     ("%#x\n", uOperation),
                     VERR_INTERNAL_ERROR);
-#else
-    if (    (    uOperation == SUP_VMMR0_DO_RAW_RUN
-             ||  uOperation == SUP_VMMR0_DO_HWACC_RUN
-             ||  uOperation == SUP_VMMR0_DO_NOP)
-        &&  !pReqHdr
-        &&  !u64Arg)
-        return (int) SUPCallVMMR0Fast(pVMR0, uOperation);
-#endif
 
     /* fake */
@@ -598 +589 @@
 
 #else
-    if (RT_LIKELY(uOperation == SUP_VMMR0_DO_RAW_RUN))
-    {
-        Assert(!pvArg);
-        return suplibOsIOCtlFast(SUP_IOCTL_FAST_DO_RAW_RUN);
-    }
-    if (RT_LIKELY(uOperation == SUP_VMMR0_DO_HWACC_RUN))
-    {
-        Assert(!pvArg);
-        return suplibOsIOCtlFast(SUP_IOCTL_FAST_DO_HWACC_RUN);
-    }
-    if (RT_LIKELY(uOperation == SUP_VMMR0_DO_NOP))
-    {
-        Assert(!pvArg);
-        return suplibOsIOCtlFast(SUP_IOCTL_FAST_DO_NOP);
-    }
+    /*
+     * The following operations don't belong here.
+     */
+    AssertMsgReturn(    uOperation != SUP_VMMR0_DO_RAW_RUN
+                    &&  uOperation != SUP_VMMR0_DO_HWACC_RUN
+                    &&  uOperation != SUP_VMMR0_DO_NOP,
+                    ("%#x\n", uOperation),
+                    VERR_INTERNAL_ERROR);
     return SUPCallVMMR0Ex(pVMR0, uOperation, (uintptr_t)pvArg, NULL);
 #endif

trunk/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp

@@ -171 +171 @@
 {
     int32_t rcRet = VERR_INTERNAL_ERROR;
-    ULONG cbRet = sizeof(rcRet);
     int rc = DosDevIOCtl(g_hDevice, SUP_CTL_CATEGORY_FAST, uFunction,
                          NULL, 0, NULL,
-                         &rcRet, sizeof(rcRet), &cbRet);
+                         NULL, 0, NULL);
     if (RT_LIKELY(rc == NO_ERROR))
         rc = rcRet;

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -296 +296 @@
         int   rc;
 
+        /* We're here with METHOD_NEITHER, which means no parameter validation has been performed. Do not use input
+         * or write to output parameters!
+         */
+
         /* Raise the IRQL to DISPATCH_LEVEl to prevent Windows from rescheduling us to another CPU/core. */
         Assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
@@ -304 +308 @@
         /* Complete the I/O request. */
         NTSTATUS rcNt = pIrp->IoStatus.Status = STATUS_SUCCESS;
-        pIrp->IoStatus.Information = sizeof(rc);
-        __try
-        {
-            *(int *)pIrp->UserBuffer = rc;
-        }
-        __except(EXCEPTION_EXECUTE_HANDLER)
-        {
-            rcNt = pIrp->IoStatus.Status = GetExceptionCode();
-            dprintf(("VBoxSupDrvDeviceContorl: Exception Code %#x\n", rcNt));
-        }
         IoCompleteRequest(pIrp, IO_NO_INCREMENT);
         return rcNt;

trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp

@@ -645 +645 @@
      */
     int rc = VERR_INTERNAL_ERROR;
-    DWORD cbReturned = (ULONG)sizeof(rc);
-    if (DeviceIoControl(g_hDevice, uFunction, NULL, 0, &rc, (DWORD)sizeof(rc), &cbReturned, NULL))
+    if (DeviceIoControl(g_hDevice, uFunction, NULL, 0, NULL, 0, NULL, NULL))
         return rc;
     return suplibConvertWin32Err(GetLastError());

trunk/src/VBox/VMM/VMM.cpp

@@ -1949 +1949 @@
             rc = VERR_GENERAL_FAILURE;
 #else
-            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_RAW_RUN, NULL);
+            rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN);
+            if (RT_LIKELY(rc == VINF_SUCCESS))
+                rc = pVM->vmm.s.iLastGCRc;
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);
@@ -1998 +2000 @@
 #else
             rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_HWACC_RUN);
+            if (RT_LIKELY(rc == VINF_SUCCESS))
+                rc = pVM->vmm.s.iLastGCRc;
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);
@@ -2078 +2082 @@
             rc = VERR_GENERAL_FAILURE;
 #else
-            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_RAW_RUN, NULL);
+            rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN);
+            if (RT_LIKELY(rc == VINF_SUCCESS))
+                rc = pVM->vmm.s.iLastGCRc;
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);
@@ -2132 +2138 @@
             rc = VERR_GENERAL_FAILURE;
 #else
-            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_RAW_RUN, NULL);
+            rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN);
+            if (RT_LIKELY(rc == VINF_SUCCESS))
+                rc = pVM->vmm.s.iLastGCRc;
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);