Changeset 105556 in vbox

Timestamp:

Aug 1, 2024 9:59:44 AM (8 weeks ago)

Author:

vboxsync

Message:

VBoxDbg: Some more ntrbtree checks. bugref:10727

File:

• trunk/src/VBox/Debugger/DBGCNtCommands.cpp (modified) (6 diffs)

trunk/src/VBox/Debugger/DBGCNtCommands.cpp

@@ -75 +75 @@
 {
     uint64_t Root;  /**< Address of the root node (NT_RTL_BALANCED_NODE64). */
-    uint64_t Min;   /**< Address of the left most node (NT_RTL_BALANCED_NODE64). */
+    /** The address of the left-most node (NT_RTL_BALANCED_NODE64).
+     *  Bit 0 is used to indicate 'Encoded', meaning that Left and Right are
+     *  XORed with the node address and Min is XORed with the address of this
+     *  structure. */
+    uint64_t Min;
 } NT_RTL_RB_TREE64;
 
@@ -97 +101 @@
 int dbgCmdNtRbTreeWorker(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PCDBGCVAR pRootAddr)
 {
+    int           rcRet          = VINF_SUCCESS;
+    uint32_t      cErrors        = 0;
     PtrType const fAlignMask     = ~(PtrType)(sizeof(PtrType) - 1);
     PtrType const fAlignInfoMask =  (PtrType)(sizeof(PtrType) - 1);
@@ -110 +116 @@
     DBGCCmdHlpPrintf(pCmdHlp,
                      sizeof(PtrType) == sizeof(uint64_t)
-                     ? "RB Root %DV: Root=%#016RX64 Min=%#016RX64\n"
-                     : "RB Root %DV: Root=%#010RX32 Min=%#010RX32\n",
-                     pRootAddr, Root.Root, Root.Min);
+                     ? "RB Root %DV: Root=%#016RX64 Min=%#016RX64%s\n"
+                     : "RB Root %DV: Root=%#010RX32 Min=%#010RX32%s\n",
+                     pRootAddr, Root.Root, Root.Min, Root.Min & 1 ? " Encoded=1" : "");
     if ((Root.Root & fAlignMask) == 0 || (Root.Min & fAlignMask) == 0)
     {
@@ -120 +126 @@
             DBGCCmdHlpPrintf(pCmdHlp, "RB Root %DV: Bogus root state!\n", pRootAddr);
         return VINF_SUCCESS;
+    }
+    if (Root.Root & fAlignInfoMask)
+    {
+        rcRet = DBGCCmdHlpFail(pCmdHlp, pCmd, "Misaligned Root pointer: %#RX64", Root.Root);
+        cErrors++;
+    }
+    if ((Root.Min & fAlignInfoMask) > 1)
+    {
+        rcRet = DBGCCmdHlpFail(pCmdHlp, pCmd, "Misaligned Min pointer: %#RX64 (bits 1+ should be zero)", Root.Min);
+        cErrors++;
     }
 
@@ -153 +169 @@
     cStackEntries++;
 
-    int      rcRet       = VINF_SUCCESS;
     uint8_t  cReqBlacks  = 0; /**< Number of black nodes required in each path. Set when we reach the left most node. */
     uint8_t  cchMaxDepth = 32;
     uint32_t idxNode     = 0;
-    uint32_t cErrors     = 0;
     while (cStackEntries > 0)
     {
@@ -222 +236 @@
                     cchMaxDepth = RT_MIN(cReqBlacks * 4, RT_ELEMENTS(aStack) * 2 + 2);
 
-                    if (Root.Min != aStack[idxCurEntry].Ptr)
+                    if ((Root.Min & ~(PtrType)1) != aStack[idxCurEntry].Ptr)
                     {
                         rcRet = DBGCCmdHlpFail(pCmdHlp, pCmd,