Changeset 52425 in vbox

Timestamp:

Aug 20, 2014 3:45:47 AM (11 years ago)

Author:

vboxsync

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

95605

Message:

SUPDrv: Revised fix.

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (modified) (3 diffs)

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

@@ -2807 +2807 @@
                     && pNtProtect->fFirstProcessCreateHandle
                     && pOpInfo->KernelHandle == 0
-                    && pNtProtect->hParentPid == PsGetProcessId(PsGetCurrentProcess()))
+                    && pNtProtect->hParentPid == PsGetProcessId(PsGetCurrentProcess())
+                    && ExGetPreviousMode() != KernelMode)
                 {
                     if (   !pOpInfo->KernelHandle
@@ -2868 +2869 @@
                 }
 
-                Log(("vboxdrv/ProcessHandlePre: %sctx=%04zx/%p wants %#x to %p/pid=%04zx [%d], allow %#x => %#x; %s\n",
+                Log(("vboxdrv/ProcessHandlePre: %sctx=%04zx/%p wants %#x to %p/pid=%04zx [%d], allow %#x => %#x; %s [prev=%#x]\n",
                      pOpInfo->KernelHandle ? "k" : "", PsGetProcessId(PsGetCurrentProcess()), PsGetCurrentProcess(),
                      pOpInfo->Parameters->CreateHandleInformation.DesiredAccess,
                      pOpInfo->Object, pNtProtect->AvlCore.Key, pNtProtect->enmProcessKind, fAllowedRights,
                      pOpInfo->Parameters->CreateHandleInformation.DesiredAccess & fAllowedRights,
-                     PsGetProcessImageFileName(PsGetCurrentProcess())));
+                     PsGetProcessImageFileName(PsGetCurrentProcess()), ExGetPreviousMode() ));
 
                 pOpInfo->Parameters->CreateHandleInformation.DesiredAccess &= fAllowedRights;
@@ -3083 +3084 @@
                 }
 
-                Log(("vboxdrv/ThreadHandlePre: %sctx=%04zx/%p wants %#x to %p in pid=%04zx [%d], allow %#x => %#x; %s\n",
+                Log(("vboxdrv/ThreadHandlePre: %sctx=%04zx/%p wants %#x to %p in pid=%04zx [%d], allow %#x => %#x; %s [prev=%#x]\n",
                      pOpInfo->KernelHandle ? "k" : "", PsGetProcessId(PsGetCurrentProcess()), PsGetCurrentProcess(),
                      pOpInfo->Parameters->CreateHandleInformation.DesiredAccess,
                      pOpInfo->Object, pNtProtect->AvlCore.Key, pNtProtect->enmProcessKind, fAllowedRights,
                      pOpInfo->Parameters->CreateHandleInformation.DesiredAccess & fAllowedRights,
-                     PsGetProcessImageFileName(PsGetCurrentProcess())));
+                     PsGetProcessImageFileName(PsGetCurrentProcess()), ExGetPreviousMode()));
 
                 pOpInfo->Parameters->CreateHandleInformation.DesiredAccess &= fAllowedRights;