Changeset 91581 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 6, 2021 7:22:22 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147290

Message:

VMM/PGMR3PhysRegisterRam: Must release lock when returning VERR_PGM_RAM_CONFLICT.

File:

• trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -1822 +1822 @@
     /*
      * Find range location and check for conflicts.
-     * (We don't lock here because the locking by EMT is only required on update.)
      */
     PPGMRAMRANGE    pPrev = NULL;
@@ -1828 +1827 @@
     while (pRam && GCPhysLast >= pRam->GCPhys)
     {
-        if (    GCPhysLast >= pRam->GCPhys
-            &&  GCPhys     <= pRam->GCPhysLast)
-            AssertLogRelMsgFailedReturn(("%RGp-%RGp (%s) conflicts with existing %RGp-%RGp (%s)\n",
-                                         GCPhys, GCPhysLast, pszDesc,
-                                         pRam->GCPhys, pRam->GCPhysLast, pRam->pszDesc),
-                                        VERR_PGM_RAM_CONFLICT);
+        AssertLogRelMsgReturnStmt(   GCPhysLast < pRam->GCPhys
+                                  || GCPhys     > pRam->GCPhysLast,
+                                  ("%RGp-%RGp (%s) conflicts with existing %RGp-%RGp (%s)\n",
+                                   GCPhys, GCPhysLast, pszDesc, pRam->GCPhys, pRam->GCPhysLast, pRam->pszDesc),
+                                  PGM_UNLOCK(pVM), VERR_PGM_RAM_CONFLICT);
 
         /* next */