Changeset 3584 in kBuild for trunk/src/lib

Timestamp:

Jan 20, 2023 3:29:36 PM (2 years ago)

Author:

bird

Message:

nt/nt_child_inject_standard_handles.c: Fixed starting 64-bit binaries from a WOW64 process.

File:

• trunk/src/lib/nt/nt_child_inject_standard_handles.c (modified) (8 diffs)

trunk/src/lib/nt/nt_child_inject_standard_handles.c

@@ -172 +172 @@
         } Wow64;
     }                           BasicInfo = { { 0, 0, } };
-    uintptr_t                   uBasicInfoPeb;
+    ULONGLONG                   ullBasicInfoPeb;
     NTSTATUS                    rcNt;
     ULONGLONG                   ullPeb32 = 0;
@@ -244 +244 @@
      */
 #if K_ARCH_BITS != 64
-/** @todo On vista PEB can be above 4GB!   */
     if (s_fHostIs64Bit && pfnNtWow64QueryInformationProcess64)
     {
@@ -254 +253 @@
             return rcNt;
         }
-        if (   BasicInfo.Wow64.PebBaseAddress < 0x1000
-            || BasicInfo.Wow64.PebBaseAddress > ~(uintptr_t)0x1000)
+        if ((ULONGLONG)BasicInfo.Wow64.PebBaseAddress < 0x1000)
         {
             _snprintf(pszErr, cbErr, "NtWow64QueryInformationProcess64 returned bad PebBaseAddress: %#llx",
@@ -261 +259 @@
             return ERROR_INVALID_ADDRESS;
         }
-        uBasicInfoPeb = (uintptr_t)BasicInfo.Wow64.PebBaseAddress;
+        ullBasicInfoPeb = BasicInfo.Wow64.PebBaseAddress;
     }
     else
@@ -276 +274 @@
         {
             _snprintf(pszErr, cbErr, "NtQueryInformationProcess returned bad PebBaseAddress: %#llx",
-                      BasicInfo.Natural.PebBaseAddress);
+                      (ULONGLONG)BasicInfo.Natural.PebBaseAddress);
             return ERROR_INVALID_ADDRESS;
         }
-        uBasicInfoPeb = (uintptr_t)BasicInfo.Natural.PebBaseAddress;
+        ullBasicInfoPeb = (uintptr_t)BasicInfo.Natural.PebBaseAddress;
     }
 
@@ -289 +287 @@
 #if K_ARCH_BITS != 64
     if (!s_fHostIs64Bit)
-        ullPeb32 = uBasicInfoPeb;
+        ullPeb32 = ullBasicInfoPeb;
     else
 #endif
@@ -299 +297 @@
         {
             ullPeb32 = uPeb32Ptr;
-            ullPeb64 = uBasicInfoPeb;
+            ullPeb64 = ullBasicInfoPeb;
 #if K_ARCH_BITS != 64
             assert(ullPeb64 != ullPeb32);
@@ -309 +307 @@
         {
             assert(NT_SUCCESS(rcNt));
-            ullPeb64 = uBasicInfoPeb;
+            ullPeb64 = ullBasicInfoPeb;
         }
     }