Changeset 42210 in vbox

Timestamp:

Jul 18, 2012 2:11:35 PM (13 years ago)

Author:

vboxsync

Message:

Main: propagate error during medium settings decryption

Location:

trunk/src/VBox/Main

Files:

• include/VirtualBoxImpl.h (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (4 diffs)

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

@@ -316 +316 @@
                                  bool aSaveRegistry = true);
 
-    void decryptSettings();
-    void decryptMediumSettings(Medium *pMedium);
+    int  decryptSettings();
+    int  decryptMediumSettings(Medium *pMedium);
     int  decryptSettingBytes(uint8_t *aPlaintext, const uint8_t *aCiphertext,
                              size_t aCiphertextSize) const;

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

@@ -2041 +2041 @@
 {
     storeSettingsKey(aValue);
-    decryptSettings();
-    return S_OK;
-}
-
-void VirtualBox::decryptMediumSettings(Medium *pMedium)
+    int vrc = decryptSettings();
+    return RT_SUCCESS(vrc) ? S_OK : E_FAIL;
+}
+
+int VirtualBox::decryptMediumSettings(Medium *pMedium)
 {
     Bstr bstrCipher;
@@ -2058 +2058 @@
         if (RT_SUCCESS(rc))
             pMedium->setPropertyDirect("InitiatorSecret", strPlaintext);
-    }
+        else
+            return rc;
+    }
+    return VINF_SUCCESS;
 }
 
@@ -2069 +2072 @@
  * properties need to be null-terminated strings.
  */
-void VirtualBox::decryptSettings()
-{
+int VirtualBox::decryptSettings()
+{
+    bool fFailure = false;
     AutoReadLock al(m->allHardDisks.getLockHandle() COMMA_LOCKVAL_SRC_POS);
     for (MediaList::const_iterator mt = m->allHardDisks.begin();
@@ -2081 +2085 @@
             continue;
         AutoWriteLock mlock(pMedium COMMA_LOCKVAL_SRC_POS);
-        decryptMediumSettings(pMedium);
-    }
+        int vrc = decryptMediumSettings(pMedium);
+        if (RT_FAILURE(vrc))
+            fFailure = true;
+    }
+    return fFailure ? VERR_INVALID_PARAMETER : VINF_SUCCESS;
 }