Changeset 82690 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Jan 9, 2020 12:01:58 PM (5 years ago)

Author:

vboxsync

Message:

DrvVD: Workaround to make encrypted VMs with snapshots work again

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -5080 +5080 @@
 
             /* Check VDConfig for encryption config. */
-            if (pCfgVDConfig)
-                pThis->pCfgCrypto = CFGMR3GetChild(pCfgVDConfig, "CRYPT");
-
-            if (pThis->pCfgCrypto)
-            {
-                /* Setup VDConfig interface for disk encryption support. */
-                pThis->VDIfCfg.pfnAreKeysValid  = drvvdCfgAreKeysValid;
-                pThis->VDIfCfg.pfnQuerySize     = drvvdCfgQuerySize;
-                pThis->VDIfCfg.pfnQuery         = drvvdCfgQuery;
-                pThis->VDIfCfg.pfnQueryBytes    = NULL;
-
-                pThis->VDIfCrypto.pfnKeyRetain               = drvvdCryptoKeyRetain;
-                pThis->VDIfCrypto.pfnKeyRelease              = drvvdCryptoKeyRelease;
-                pThis->VDIfCrypto.pfnKeyStorePasswordRetain  = drvvdCryptoKeyStorePasswordRetain;
-                pThis->VDIfCrypto.pfnKeyStorePasswordRelease = drvvdCryptoKeyStorePasswordRelease;
+            /** @todo This makes sure that the crypto config is not cleared accidentally
+             * when it was set because there are multiple VDConfig entries for a snapshot chain
+             * but only one contains the crypto config.
+             *
+             * This needs to be properly fixed by specifying which part of the image should contain the
+             * crypto stuff.
+             */
+            if (!pThis->pCfgCrypto)
+            {
+                if (pCfgVDConfig)
+                    pThis->pCfgCrypto = CFGMR3GetChild(pCfgVDConfig, "CRYPT");
+
+                if (pThis->pCfgCrypto)
+                {
+                    /* Setup VDConfig interface for disk encryption support. */
+                    pThis->VDIfCfg.pfnAreKeysValid  = drvvdCfgAreKeysValid;
+                    pThis->VDIfCfg.pfnQuerySize     = drvvdCfgQuerySize;
+                    pThis->VDIfCfg.pfnQuery         = drvvdCfgQuery;
+                    pThis->VDIfCfg.pfnQueryBytes    = NULL;
+
+                    pThis->VDIfCrypto.pfnKeyRetain               = drvvdCryptoKeyRetain;
+                    pThis->VDIfCrypto.pfnKeyRelease              = drvvdCryptoKeyRelease;
+                    pThis->VDIfCrypto.pfnKeyStorePasswordRetain  = drvvdCryptoKeyStorePasswordRetain;
+                    pThis->VDIfCrypto.pfnKeyStorePasswordRelease = drvvdCryptoKeyStorePasswordRelease;
+                }
             }