Changeset 20883 in vbox

Timestamp:

Jun 24, 2009 9:08:48 AM (16 years ago)

Author:

vboxsync

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

49029

Message:

Call KeWaitForSingleObject with UserMode for event semaphores

Location:

trunk/src/VBox/Runtime/r0drv/nt

Files:

• semevent-r0drv-nt.cpp (modified) (1 diff)
• semeventmulti-r0drv-nt.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp

@@ -138 +138 @@
     /*
      * Wait for it.
+     *
+     * We default to UserMode here as the waits might be aborted due to process termination. 
+     * @todo As far as I can tell this is currently safe as all calls are made on behalf of user threads.
      */
     NTSTATUS rcNt;
     if (cMillies == RT_INDEFINITE_WAIT)
-        rcNt = KeWaitForSingleObject(&pEventInt->Event, Executive, KernelMode, fInterruptible, NULL);
+        rcNt = KeWaitForSingleObject(&pEventInt->Event, Executive, UserMode, fInterruptible, NULL);
     else
     {
-        LARGE_INTEGER Timeout;
-        Timeout.QuadPart = -(int64_t)cMillies * 10000;
-        rcNt = KeWaitForSingleObject(&pEventInt->Event, Executive, KernelMode, fInterruptible, &Timeout);
+        /* Can't use the stack here as the wait is UserMode. */
+        PLARGE_INTEGER pTimeout = (PLARGE_INTEGER)RTMemAlloc(sizeof(*pTimeout));
+        if (!pTimeout)
+            return VERR_NO_MEMORY;
+
+        pTimeout->QuadPart = -(int64_t)cMillies * 10000;
+        rcNt = KeWaitForSingleObject(&pEventInt->Event, Executive, UserMode, fInterruptible, pTimeout);
+        RTMemFree(pTimeout);
     }
     switch (rcNt)

trunk/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp

@@ -148 +148 @@
     NTSTATUS rcNt;
     if (cMillies == RT_INDEFINITE_WAIT)
-        rcNt = KeWaitForSingleObject(&pThis->Event, Executive, KernelMode, fInterruptible, NULL);
+        rcNt = KeWaitForSingleObject(&pThis->Event, Executive, UserMode, fInterruptible, NULL);
     else
     {
-        LARGE_INTEGER Timeout;
-        Timeout.QuadPart = -(int64_t)cMillies * 10000;
-        rcNt = KeWaitForSingleObject(&pThis->Event, Executive, KernelMode, fInterruptible, &Timeout);
+        /* Can't use the stack here as the wait is UserMode. */
+        PLARGE_INTEGER pTimeout = (PLARGE_INTEGER)RTMemAlloc(sizeof(*pTimeout));
+        if (!pTimeout)
+            return VERR_NO_MEMORY;
+
+        pTimeout->QuadPart = -(int64_t)cMillies * 10000;
+        rcNt = KeWaitForSingleObject(&pThis->Event, Executive, UserMode, fInterruptible, pTimeout);
+        RTMemFree(pTimeout);
     }
     switch (rcNt)