Changeset 53027 in vbox for trunk

Timestamp:

Oct 10, 2014 12:10:38 PM (10 years ago)

Author:

vboxsync

Message:

Forward ported r96507: SUP: Don't wait for yourself to quit, wait on your parent. Duh.

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPR3HardenedMain-win.cpp (modified) (1 diff)

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

@@ -3830 +3830 @@
     if (pThis->iWhich > 1)
     {
-        OBJECT_ATTRIBUTES ObjAttr;
-        InitializeObjectAttributes(&ObjAttr, NULL, 0, NULL /*hRootDir*/, NULL /*pSecDesc*/);
-
-        CLIENT_ID ClientId;
-        ClientId.UniqueProcess = (HANDLE)pThis->BasicInfo.InheritedFromUniqueProcessId;
-        ClientId.UniqueThread  = NULL;
-
-        rcNt = NtOpenProcess(&pThis->hParent, SYNCHRONIZE | PROCESS_QUERY_INFORMATION, &ObjAttr, &ClientId);
+        PROCESS_BASIC_INFORMATION SelfInfo;
+        rcNt = NtQueryInformationProcess(NtCurrentProcess(), ProcessBasicInformation, &SelfInfo, sizeof(SelfInfo), &cbActual);
+        if (NT_SUCCESS(rcNt))
+        {
+            OBJECT_ATTRIBUTES ObjAttr;
+            InitializeObjectAttributes(&ObjAttr, NULL, 0, NULL /*hRootDir*/, NULL /*pSecDesc*/);
+
+            CLIENT_ID ClientId;
+            ClientId.UniqueProcess = (HANDLE)SelfInfo.InheritedFromUniqueProcessId;
+            ClientId.UniqueThread  = NULL;
+
+            rcNt = NtOpenProcess(&pThis->hParent, SYNCHRONIZE | PROCESS_QUERY_INFORMATION, &ObjAttr, &ClientId);
 #ifdef DEBUG
-        SUPR3HARDENED_ASSERT_NT_SUCCESS(rcNt);
+            SUPR3HARDENED_ASSERT_NT_SUCCESS(rcNt);
 #endif
-        if (!NT_SUCCESS(rcNt))
-        {
-            pThis->hParent = NULL;
-            SUP_DPRINTF(("supR3HardNtChildGatherData: Failed to open parent process (%#p): %#x\n", ClientId.UniqueProcess, rcNt));
+            if (!NT_SUCCESS(rcNt))
+            {
+                pThis->hParent = NULL;
+                SUP_DPRINTF(("supR3HardNtChildGatherData: Failed to open parent process (%#p): %#x\n", ClientId.UniqueProcess, rcNt));
+            }
         }
+
     }