Changeset 90824 in vbox for trunk

Timestamp:

Aug 23, 2021 10:47:49 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Don't use RT_VALID_PTR on ring-3 address in ring-0.

File:

• trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -956 +956 @@
                                      */
                                     PVMR3 pVMR3 = RTR0MemObjAddressR3(pGVM->gvmm.s.VMMapObj);
-                                    AssertPtr((void *)pVMR3);
+                                    AssertMsg(RTR0MemUserIsValidAddr(pVMR3) && pVMR3 != NIL_RTR3PTR, ("%p\n", pVMR3));
 
                                     for (VMCPUID i = 0; i < cCpus; i++)
@@ -965 +965 @@
                                         pGVM->aCpus[i].pVCpuR3 = pGVM->apCpusR3[i];
                                         pGVM->apCpusR0[i] = &pGVM->aCpus[i];
-                                        AssertPtr((void *)pGVM->apCpusR3[i]);
+                                        AssertMsg(RTR0MemUserIsValidAddr(pGVM->apCpusR3[i]) && pGVM->apCpusR3[i] != NIL_RTR3PTR,
+                                                  ("apCpusR3[%u]=%p\n", i, pGVM->apCpusR3[i]));
                                     }
 
                                     pGVM->paVMPagesR3 = RTR0MemObjAddressR3(pGVM->gvmm.s.VMPagesMapObj);
-                                    AssertPtr((void *)pGVM->paVMPagesR3);
+                                    AssertMsg(RTR0MemUserIsValidAddr(pGVM->paVMPagesR3) && pGVM->paVMPagesR3 != NIL_RTR3PTR,
+                                              ("%p\n", pGVM->paVMPagesR3));
 
                                     /*