Changeset 56448 in vbox

Timestamp:

Jun 16, 2015 1:09:31 PM (10 years ago)

Author:

vboxsync

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

101065

Message:

Main/Session: Fix possible deadlock in Session:i_unlockMachine(). Releasing the lock had no effect because the write lock was acquired twice

Location:

trunk/src/VBox/Main

Files:

• include/SessionImpl.h (modified) (1 diff)
• src-client/SessionImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/include/SessionImpl.h

@@ -141 +141 @@
 
 
-    HRESULT i_unlockMachine(bool aFinalRelease, bool aFromServer);
+    HRESULT i_unlockMachine(bool aFinalRelease, bool aFromServer, AutoWriteLock *pLockW);
 
     SessionState_T mState;

trunk/src/VBox/Main/src-client/SessionImpl.cpp

@@ -123 +123 @@
                mState == SessionState_Spawning);
 
-        HRESULT rc = i_unlockMachine(true /* aFinalRelease */, false /* aFromServer */);
+        HRESULT rc = i_unlockMachine(true /* aFinalRelease */, false /* aFromServer */, &alock);
         AssertComRC(rc);
     }
@@ -240 +240 @@
 
     CHECK_OPEN();
-
-    return i_unlockMachine(false /* aFinalRelease */, false /* aFromServer */);
+    return i_unlockMachine(false /* aFinalRelease */, false /* aFromServer */, &alock);
 }
 
@@ -535 +534 @@
 
         /* close ourselves */
-        rc = i_unlockMachine(false /* aFinalRelease */, true /* aFromServer */);
+        rc = i_unlockMachine(false /* aFinalRelease */, true /* aFromServer */, &alock);
     }
     else if (getObjectState().getState() == ObjectState::InUninit)
@@ -1058 +1057 @@
  *  @param aFinalRelease    called as a result of FinalRelease()
  *  @param aFromServer      called as a result of Uninitialize()
+ *  @param pLockW           The write lock this object is protected with.
+ *                          Must be acquired already and will be released
+ *                          and later reacquired during the unlocking.
  *
  *  @note To be called only from #uninit(), #UnlockMachine() or #Uninitialize().
- *  @note Locks this object for writing.
  */
-HRESULT Session::i_unlockMachine(bool aFinalRelease, bool aFromServer)
+HRESULT Session::i_unlockMachine(bool aFinalRelease, bool aFromServer, AutoWriteLock *pLockW)
 {
     LogFlowThisFuncEnter();
@@ -1068 +1069 @@
                       aFinalRelease, aFromServer));
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     LogFlowThisFunc(("mState=%s, mType=%d\n", Global::stringifySessionState(mState), mType));
+
+    Assert(pLockW->isWriteLockOnCurrentThread());
 
     if (mState != SessionState_Locked)
@@ -1137 +1138 @@
          *  SessionState_Closing here, so it's safe.
          */
-        alock.release();
+        pLockW->release();
 
         LogFlowThisFunc(("Calling mControl->OnSessionEnd()...\n"));
@@ -1143 +1144 @@
         LogFlowThisFunc(("mControl->OnSessionEnd()=%08X\n", rc));
 
-        alock.acquire();
+        pLockW->acquire();
 
         /*