Changeset 94840 in vbox

Timestamp:

May 5, 2022 10:35:12 AM (3 years ago)

Author:

vboxsync

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

151239

Message:

Main/VirtualBoxImpl: Fix a possible lock order violation when the Machine object calls into the parent VirtualBox object when trying to retain the cryptographic interface, bugref:9955

File:

• trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -455 +455 @@
     /** Pointer to the cryptographic support interface. */
     PCVBOXCRYPTOIF                      pCryptoIf;
+    /** Critical section protecting the module handle. */
+    RTCRITSECT                          CritSectModCrypto;
     /** @} */
 };
@@ -570 +572 @@
 
         i_reportDriverVersions();
+
+        /* Create the critical section protecting the cryptographic module handle. */
+        {
+            int vrc = RTCritSectInit(&m->CritSectModCrypto);
+            if (RT_FAILURE(vrc))
+                throw setErrorBoth(E_FAIL, vrc,
+                                   tr("Could not create the cryptographic module critical section (%Rrc)"),
+                                   vrc);
+
+        }
 
         /* compose the VirtualBox.xml file name */
@@ -1096 +1108 @@
     }
 
+    RTCritSectDelete(&m->CritSectModCrypto);
+
 #ifdef VBOX_WITH_EXTPACK
     if (m->ptrExtPackManager)
@@ -6130 +6144 @@
     AssertComRCReturnRC(autoCaller.rc());
 
-    AutoWriteLock wlock(this COMMA_LOCKVAL_SRC_POS);
+    /*
+     * No object lock due to some lock order fun with Machine objects.
+     * There is a dedicated critical section to protect against concurrency
+     * issues when loading the module.
+     */
+    RTCritSectEnter(&m->CritSectModCrypto);
 
     /* Try to load the extension pack module if it isn't currently. */
@@ -6194 +6213 @@
     }
 
+    RTCritSectLeave(&m->CritSectModCrypto);
+
     return hrc;
 }
@@ -6210 +6231 @@
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
-
-    AutoWriteLock wlock(this COMMA_LOCKVAL_SRC_POS);
 
     AssertReturn(pCryptoIf == m->pCryptoIf, E_INVALIDARG);
@@ -6238 +6257 @@
                         tr("The cryptographic support module is in use and can't be unloaded"));
 
+    RTCritSectEnter(&m->CritSectModCrypto);
     if (m->hLdrModCrypto != NIL_RTLDRMOD)
     {
@@ -6244 +6264 @@
         m->hLdrModCrypto = NIL_RTLDRMOD;
     }
+    RTCritSectLeave(&m->CritSectModCrypto);
 
     return S_OK;