Changeset 66294 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Mar 28, 2017 11:48:21 AM (8 years ago)

Author:

vboxsync

Message:

ExtPackManagerImpl.cpp: Must not hold the extpack manager lock when calling i_areThereAnyRunningVMs() or we trigger a lock order violation.

File:

• trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -2437 +2437 @@
 
 #if !defined(VBOX_COM_INPROC)
+
 /**
  * Refreshes the specified extension pack.
@@ -2640 +2641 @@
             if (pExtPack && a_fReplace)
             {
-                if (!i_areThereAnyRunningVMs())
-                    hrc = pExtPack->i_callUninstallHookAndClose(m->pVirtualBox, false /*a_ForcedRemoval*/);
-                else
+                /* We must leave the lock when calling i_areThereAnyRunningVMs,
+                   which means we have to redo the refresh call afterwards. */
+                autoLock.release();
+                bool fRunningVMs = i_areThereAnyRunningVMs();
+                autoLock.acquire();
+                hrc = i_refreshExtPack(pStrName->c_str(), false /*a_fUnusableIsError*/, &pExtPack);
+                if (fRunningVMs)
                 {
                     LogRel(("Install extension pack '%s' failed because at least one VM is still running.", pStrName->c_str()));
@@ -2648 +2653 @@
                                    pStrName->c_str());
                 }
+                else if (SUCCEEDED(hrc) && pExtPack)
+                    hrc = pExtPack->i_callUninstallHookAndClose(m->pVirtualBox, false /*a_ForcedRemoval*/);
             }
             else if (pExtPack)
@@ -2743 +2750 @@
     AutoCaller autoCaller(this);
     HRESULT hrc = autoCaller.rc();
-
     if (SUCCEEDED(hrc))
     {
-        AutoWriteLock autoLock(this COMMA_LOCKVAL_SRC_POS);
         if (a_fForcedRemoval || !i_areThereAnyRunningVMs())
         {
+            AutoWriteLock autoLock(this COMMA_LOCKVAL_SRC_POS);
+
             /*
              * Refresh the data we have on the extension pack as it may be made
@@ -2818 +2825 @@
          */
         if (m->enmContext == VBOXEXTPACKCTX_PER_USER_DAEMON)
-        {
-            autoLock.release();
             i_callAllVirtualBoxReadyHooks();
-        }
     }
 
@@ -2852 +2856 @@
     }
 }
-#endif
+
+#endif /* !VBOX_COM_INPROC */
 
 /**