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

Timestamp:

May 25, 2020 12:49:55 PM (5 years ago)

Author:

vboxsync

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

138225

Message:

SUPDrv-win.cpp: Relax the ImageBase check when comparing NT loaded and IPRT loaded image bits. This broke on older windows versions after we updated the compiler to 14.2. Perhaps some linker version check there. Saw addresses like 0x000007fef3c20000 and 0x000007fddf250000 rather than the linker base address or actual kernel load address. Weird. bugref:8489

File:

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

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

@@ -2297 +2297 @@
          * On Windows 10 the ImageBase member of the optional header is sometimes
          * updated with the actual load address and sometimes not.
+         * On older windows versions (builds <= 9200?), a user mode address is
+         * sometimes found in the image base field after upgrading to VC++ 14.2.
          */
         uint32_t const  offNtHdrs = *(uint16_t *)pbImageBits == IMAGE_DOS_SIGNATURE
@@ -2308 +2310 @@
         uint32_t const  cbImageBase  = RT_SIZEOFMEMB(IMAGE_NT_HEADERS, OptionalHeader.ImageBase);
         if (   pNtHdrsNtLd->OptionalHeader.ImageBase != pNtHdrsIprt->OptionalHeader.ImageBase
-            && (   pNtHdrsNtLd->OptionalHeader.ImageBase == (uintptr_t)pImage->pvImage
-                || pNtHdrsIprt->OptionalHeader.ImageBase == (uintptr_t)pImage->pvImage)
             && pNtHdrsIprt->Signature == IMAGE_NT_SIGNATURE
             && pNtHdrsIprt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR_MAGIC
@@ -2338 +2338 @@
 
             /* ImageBase: */
-            if (   pNtHdrsNtLd->OptionalHeader.ImageBase != pNtHdrsIprt->OptionalHeader.ImageBase
-                && (   pNtHdrsNtLd->OptionalHeader.ImageBase == (uintptr_t)pImage->pvImage
-                    || pNtHdrsIprt->OptionalHeader.ImageBase == (uintptr_t)pImage->pvImage) )
+            if (pNtHdrsNtLd->OptionalHeader.ImageBase != pNtHdrsIprt->OptionalHeader.ImageBase)
                 supdrvNtAddExclRegion(&ExcludeRegions, offImageBase, cbImageBase);