Changeset 26738 in vbox for trunk

Timestamp:

Feb 24, 2010 11:27:45 AM (15 years ago)

Author:

vboxsync

Message:

Main: fix locking order violation in Machine::AttachDevice()

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2413 +2413 @@
     bool fNeedsSaveSettings = false;
 
-    /* protect the media tree all the while we're in here, as well as our member variables */
-    AutoMultiWriteLock2 alock(this->lockHandle(), &mParent->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
+    // request the host lock first, since might be calling Host methods for getting host drives;
+    // next, protect the media tree all the while we're in here, as well as our member variables
+    AutoMultiWriteLock3 alock(mParent->host()->lockHandle(),
+                              this->lockHandle(),
+                              &mParent->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
 
     HRESULT rc = checkStateDependency(MutableStateDep);