Changeset 38323 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Aug 5, 2011 10:27:14 AM (14 years ago)

Author:

vboxsync

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

73339

Message:

VBoxDrv: Don't create a session for ring-0 client that will be destroyed immeidately. Drop the windows specific cleanup hack.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (1 diff)
• win/SUPDrv-win.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -1913 +1913 @@
             REQ_CHECK_IDC_SIZE(SUPDRV_IDC_REQ_DISCONNECT, sizeof(*pReqHdr));
 
-#ifdef RT_OS_WINDOWS
-            /* Windows will destroy the session when the file object is destroyed. */
-#else
             supdrvCloseSession(pDevExt, pSession);
-#endif
             return pReqHdr->rc = VINF_SUCCESS;
         }

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

@@ -232 +232 @@
 NTSTATUS _stdcall VBoxDrvNtCreate(PDEVICE_OBJECT pDevObj, PIRP pIrp)
 {
-    Log(("VBoxDrvNtCreate\n"));
+    Log(("VBoxDrvNtCreate: RequestorMode=%d\n", pIrp->RequestorMode));
     PIO_STACK_LOCATION  pStack = IoGetCurrentIrpStackLocation(pIrp);
     PFILE_OBJECT        pFileObj = pStack->FileObject;
@@ -250 +250 @@
 
     /*
-     * Call common code for the rest.
+     * Don't create a session for kernel clients, they'll close the handle 
+     * immediately and work with the file object via 
+     * VBoxDrvNtInternalDeviceControl.  The first request will there be one 
+     * to create a session. 
      */
-    pFileObj->FsContext = NULL;
-    PSUPDRVSESSION pSession;
-//#if 0 /** @todo check if this works, consider OBJ_KERNEL_HANDLE too. */
-    bool fUser = pIrp->RequestorMode != KernelMode;
-//#else
- //   bool fUser = true;
-//#endif
-    int rc = supdrvCreateSession(pDevExt, fUser, &pSession);
-    if (!rc)
-        pFileObj->FsContext = pSession;
-
-    NTSTATUS    rcNt = pIrp->IoStatus.Status = VBoxDrvNtErr2NtStatus(rc);
+    NTSTATUS rcNt;
+    if (pIrp->RequestorMode == KernelMode)
+        rcNt = STATUS_SUCCESS;
+    else
+    {
+        /*
+         * Call common code for the rest.
+         */
+        pFileObj->FsContext = NULL;
+        PSUPDRVSESSION pSession;
+        int rc = supdrvCreateSession(pDevExt, true /*fUser*/, &pSession);
+        if (!rc)
+            pFileObj->FsContext = pSession;
+        rcNt = pIrp->IoStatus.Status = VBoxDrvNtErr2NtStatus(rc);
+    }
+
     pIrp->IoStatus.Information  = 0;
     IoCompleteRequest(pIrp, IO_NO_INCREMENT);
@@ -496 +503 @@
             {
                 /*
-                 * Do the job.
+                 * Call the generic code. 
+                 *  
+                 * Note! Connect and disconnect requires some extra attention 
+                 *       in order to get the session handling right.
                  */
+                if (pStack->Parameters.DeviceIoControl.IoControlCode == SUPDRV_IDC_REQ_DISCONNECT)
+                    pFileObj->FsContext = NULL;
+
                 rc = supdrvIDC(pStack->Parameters.DeviceIoControl.IoControlCode, pDevExt, pSession, pHdr);
                 if (!rc)
@@ -503 +516 @@
                     if (pStack->Parameters.DeviceIoControl.IoControlCode == SUPDRV_IDC_REQ_CONNECT)
                         pFileObj->FsContext = ((PSUPDRVIDCREQCONNECT)pHdr)->u.Out.pSession;
-                    /** @todo Handle SUPDRV_IDC_REQ_DISCONNECT and drop the
-                     *        windows hack in the generic code. */
 
                     rcNt = STATUS_SUCCESS;
@@ -510 +521 @@
                 }
                 else
+                {
                     rcNt = STATUS_INVALID_PARAMETER;
+                    if (pStack->Parameters.DeviceIoControl.IoControlCode == SUPDRV_IDC_REQ_DISCONNECT)
+                        pFileObj->FsContext = pSession;
+                }
                 Log2(("VBoxDrvNtInternalDeviceControl: returns %#x/rc=%#x\n", rcNt, rc));
             }