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

Timestamp:

Nov 4, 2021 12:29:20 AM (3 years ago)

Author:

vboxsync

Message:

SUPDrv-win.cpp: Debugged and enabled the VBOXDRV_WITH_SID_TO_UID_MAPPING code. bugref:10093

File:

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

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

@@ -92 +92 @@
 /** Enables generating UID from NT SIDs so the GMM can share free memory
  *  among VMs running as the same user. */
-//#define VBOXDRV_WITH_SID_TO_UID_MAPPING
+#define VBOXDRV_WITH_SID_TO_UID_MAPPING
 
 /* Missing if we're compiling against older WDKs. */
@@ -875 +875 @@
          */
         UNICODE_STRING UniStr = RTNT_NULL_UNISTR();
-        rcNt = RtlConvertSidToUnicodeString(&UniStr, &pTokenUser->User.Sid, TRUE /*AllocateDesitnationString*/);
+        rcNt = RtlConvertSidToUnicodeString(&UniStr, pTokenUser->User.Sid, TRUE /*AllocateDesitnationString*/);
         if (NT_SUCCESS(rcNt))
         {
@@ -892 +892 @@
                         pNtUserIdNew->cchSid       = (uint16_t)cchSid;
                         pNtUserIdNew->cRefs        = 1;
+                        Log5Func(("pNtUserId=%p cchSid=%u hash=%#x '%s'\n", pNtUserIdNew, cchSid, pNtUserIdNew->HashCore.Key, pszSid));
 
                         /*
@@ -910 +911 @@
                             {
                                 /* Found matching: Retain reference and free the new entry we prepared. */
-                                uint32_t cRefs = ASMAtomicIncU32(&pNtUserId->cRefs);
-                                Assert(cRefs < _16K);
+                                uint32_t const cRefs = ASMAtomicIncU32(&pNtUserId->cRefs);
+                                Assert(cRefs < _16K); RT_NOREF(cRefs);
                                 RTSpinlockRelease(g_hNtUserIdLock);
+                                Log5Func(("Using %p / %#x instead\n", pNtUserId, pNtUserId->UidCore.Key));
                             }
                             else
@@ -924 +926 @@
                                 }
                                 RTSpinlockRelease(g_hNtUserIdLock);
+                                if (pNtUserId)
+                                    Log5Func(("Using %p / %#x (the prepared one)\n", pNtUserId, pNtUserId->UidCore.Key));
+                                else
+                                    LogRelFunc(("supdrvNtUserIdMakeForSession: failed to insert new\n"));
                             }
                         }
@@ -936 +942 @@
                             }
                             RTSpinlockRelease(g_hNtUserIdLock);
+                            if (pNtUserId)
+                                Log5Func(("Using %p / %#x (the prepared one, no conflict)\n", pNtUserId, pNtUserId->UidCore.Key));
+                            else
+                                LogRelFunc(("failed to insert!! WTF!?!\n"));
                         }
 
@@ -956 +966 @@
         }
         else
+        {
             rc = RTErrConvertFromNtStatus(rcNt);
+            LogFunc(("RtlConvertSidToUnicodeString failed: %#x / %Rrc\n", rcNt, rc));
+        }
         ExFreePool(pTokenUser);
     }
     else
+    {
         rc = RTErrConvertFromNtStatus(rcNt);
+        LogFunc(("SeQueryInformationToken failed: %#x / %Rrc\n", rcNt, rc));
+    }
 
     SeReleaseSubjectContext(&Ctx);
@@ -976 +992 @@
     if (pNtUserId)
     {
-        uint32_t cRefs = ASMAtomicDecU32(&pNtUserId->cRefs);
+        uint32_t const cRefs = ASMAtomicDecU32(&pNtUserId->cRefs);
+        Log5Func(("%p / %#x: cRefs=%d\n", pNtUserId, pNtUserId->cRefs));
         Assert(cRefs < _8K);
         if (cRefs == 0)