Changeset 105710 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 16, 2024 1:55:32 PM (3 months ago)

Author:

vboxsync

Message:

DevBusLogic: Avoid a deadlock that can happen with broken guests that place the mailbox at a non-RAM address (see bugref:10740).

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

@@ -1391 +1391 @@
     MbxIn.u.in.uCompletionCode     = uMailboxCompletionCode;
 
-    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSectIntr, VINF_SUCCESS);
-    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSectIntr, rc);
-
     RTGCPHYS GCPhysAddrMailboxIncoming = pThis->GCPhysAddrMailboxIncomingBase
                                        + (   pThis->uMailboxIncomingPositionCurrent
@@ -1432 +1429 @@
         blPhysWriteMeta(pDevIns, pThis, GCPhysAddrMailboxIncoming, &MbxIn, sizeof(Mailbox32));
     }
+
+    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSectIntr, VINF_SUCCESS);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSectIntr, rc);
 
     /* Advance to next mailbox position. */