Changeset 29980 in vbox

Timestamp:

Jun 2, 2010 11:44:51 AM (15 years ago)

Author:

vboxsync

Message:

Check by module name and version for win64 guests as it's unlikely two guests will share the same virtual address space layout for dlls and kernel modules

File:

• trunk/src/VBox/VMM/VMMR0/GMMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -3474 +3474 @@
 }
 
+typedef struct
+{
+    PAVLGCPTRNODECORE    pNode;
+    char                *pszModuleName;
+    char                *pszVersion;
+    VBOXOSFAMILY         enmGuestOS;
+} GMMFINDMODULEBYNAME, *PGMMFINDMODULEBYNAME;
+
+/**
+ * Tree enumeration callback for finding identical modules by name and version
+ */
+DECLCALLBACK(int) gmmR0CheckForIdenticalModule(PAVLGCPTRNODECORE pNode, void *pvUser)
+{
+    PGMMFINDMODULEBYNAME pInfo = (PGMMFINDMODULEBYNAME)pvUser;
+    PGMMSHAREDMODULE     pModule = (PGMMSHAREDMODULE)pNode;
+
+    if (    pInfo
+        &&  pInfo->enmGuestOS == pModule->enmGuestOS
+        /** todo replace with RTStrNCmp */
+        &&  !strcmp(pModule->szName, pInfo->pszModuleName)
+        &&  !strcmp(pModule->szVersion, pInfo->pszVersion))
+    {
+        pInfo->pNode = pNode;
+        return 1;   /* stop search */
+    }
+    return 0;
+}
+
 
 /**
@@ -3538 +3566 @@
         /* Check if this module is already globally registered. */
         PGMMSHAREDMODULE pGlobalModule = (PGMMSHAREDMODULE)RTAvlGCPtrGet(&pGMM->pGlobalSharedModuleTree, GCBaseAddr);
+        if (    !pGlobalModule
+            &&  enmGuestOS == VBOXOSFAMILY_Windows64)
+        {
+            /* Two identical copies of e.g. Win7 x64 will typically not have a similar virtual address space layout for dlls or kernel modules.
+             * Try to find identical binaries based on name and version.
+             */
+            GMMFINDMODULEBYNAME Info;
+
+            Info.pNode         = NULL;
+            Info.pszVersion    = pszVersion;
+            Info.pszModuleName = pszModuleName;
+            Info.enmGuestOS    = enmGuestOS;
+
+            int ret = RTAvlGCPtrDoWithAll(&pGMM->pGlobalSharedModuleTree, true /* fFromLeft */, gmmR0CheckForIdenticalModule, &Info);
+            if (ret == 1)
+            {
+                Assert(Info.pNode);
+                pGlobalModule = (PGMMSHAREDMODULE)Info.pNode;
+            }
+        }
+
         if (!pGlobalModule)
         {