Changeset 25308 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Dec 10, 2009 4:48:49 PM (15 years ago)

Author:

vboxsync

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

55874

Message:

SUPDrv: Lock down the natively loaded image.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrvInternal.h (modified) (1 diff)
• win/SUPDrv-win.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -435 +435 @@
     /** The section object for the loaded image (fNative=true). */
     void                           *pvNtSectionObj;
+    /** Lock object. */
+    RTR0MEMOBJ                      hMemLock;
 #endif
     /** Whether it's loaded by the native loader or not. */

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

@@ -614 +614 @@
 int  VBOXCALL   supdrvOSLdrOpen(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage, const char *pszFilename)
 {
+    pImage->pvNtSectionObj = NULL;
+    pImage->hMemLock = NIL_RTR0MEMOBJ;
+
 #ifdef VBOX_WITHOUT_NATIVE_R0_LOADER
     NOREF(pDevExt); NOREF(pszFilename); NOREF(pImage);
@@ -663 +666 @@
             if (pImage->cbImageBits == Info.ImageLength)
             {
-                /** @todo do we need to lock down the image? */
-                rc = VINF_SUCCESS;
+                /*
+                 * Lock down the entire image, just to be on the safe side.
+                 */
+                rc = RTR0MemObjLockKernel(&pImage->hMemLock, pImage->pvImage, pImage->cbImageBits, RTMEM_PROT_READ);
+                if (RT_FAILURE(rc))
+                {
+                    pImage->hMemLock = NIL_RTR0MEMOBJ;
+                    supdrvOSLdrUnload(pDevExt, pImage);
+                }
             }
             else
@@ -752 +762 @@
     if (pImage->pvNtSectionObj)
     {
+        if (pImage->hMemLock != NIL_RTR0MEMOBJ)
+        {
+            RTR0MemObjFree(pImage->hMemLock, false /*fFreeMappings*/);
+            pImage->hMemLock = NIL_RTR0MEMOBJ;
+        }
+
         NTSTATUS rc = ZwSetSystemInformation(MY_SystemUnloadGdiDriverInformation,
                                              &pImage->pvNtSectionObj, sizeof(pImage->pvNtSectionObj));
+        pImage->pvNtSectionObj = NULL;
     }
     NOREF(pDevExt);