Changeset 103435 in vbox for trunk/src/VBox/Storage

Timestamp:

Feb 19, 2024 12:45:14 PM (12 months ago)

Author:

vboxsync

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

161764

Message:

Storage/{VISO.cpp,ISCSI.cpp}: Verify that there is a config interface before using it, bugref:3409

Location:

trunk/src/VBox/Storage

Files:

• ISCSI.cpp (modified) (2 diffs)
• VISO.cpp (modified) (2 diffs)

trunk/src/VBox/Storage/ISCSI.cpp

@@ -5401 +5401 @@
     char *pszLUN     = NULL;
     char *pszAddress = NULL;
-    int rc = VDCFGQueryStringAlloc(VDIfConfigGet(pConfig), "TargetName", &pszTarget);
-    if (RT_SUCCESS(rc))
-    {
-        rc = VDCFGQueryStringAlloc(VDIfConfigGet(pConfig), "LUN", &pszLUN);
+
+    int rc;
+    PVDINTERFACECONFIG pIfCfg = VDIfConfigGet(pConfig);
+    if (pIfCfg)
+    {
+        rc = VDCFGQueryStringAlloc(pIfCfg, "TargetName", &pszTarget);
         if (RT_SUCCESS(rc))
         {
-            rc = VDCFGQueryStringAlloc(VDIfConfigGet(pConfig), "TargetAddress", &pszAddress);
+            rc = VDCFGQueryStringAlloc(pIfCfg, "LUN", &pszLUN);
             if (RT_SUCCESS(rc))
             {
-                if (RTStrAPrintf(pszLocation, "iscsi://%s/%s/%s",
-                                 pszAddress, pszTarget, pszLUN) < 0)
-                    rc = VERR_NO_MEMORY;
+                rc = VDCFGQueryStringAlloc(pIfCfg, "TargetAddress", &pszAddress);
+                if (RT_SUCCESS(rc))
+                {
+                    if (RTStrAPrintf(pszLocation, "iscsi://%s/%s/%s",
+                                     pszAddress, pszTarget, pszLUN) < 0)
+                        rc = VERR_NO_MEMORY;
+
+                    RTMemFree(pszAddress);
+                }
+                RTMemFree(pszLUN);
             }
-        }
-    }
-    RTMemFree(pszTarget);
-    RTMemFree(pszLUN);
-    RTMemFree(pszAddress);
+            RTMemFree(pszTarget);
+        }
+    }
+    else
+        rc = VERR_INVALID_PARAMETER;
+
     return rc;
 }
@@ -5428 +5438 @@
     char *pszLUN     = NULL;
     char *pszAddress = NULL;
-    int rc = VDCFGQueryStringAlloc(VDIfConfigGet(pConfig), "TargetName", &pszTarget);
-    if (RT_SUCCESS(rc))
-    {
-        rc = VDCFGQueryStringAlloc(VDIfConfigGet(pConfig), "LUN", &pszLUN);
+
+    int rc;
+    PVDINTERFACECONFIG pIfCfg = VDIfConfigGet(pConfig);
+    if (pIfCfg)
+    {
+        rc = VDCFGQueryStringAlloc(pIfCfg, "TargetName", &pszTarget);
         if (RT_SUCCESS(rc))
         {
-            rc = VDCFGQueryStringAlloc(VDIfConfigGet(pConfig), "TargetAddress", &pszAddress);
+            rc = VDCFGQueryStringAlloc(pIfCfg, "LUN", &pszLUN);
             if (RT_SUCCESS(rc))
             {
-                /** @todo think about a nicer looking location scheme for iSCSI */
-                if (RTStrAPrintf(pszName, "%s/%s/%s",
-                                 pszAddress, pszTarget, pszLUN) < 0)
-                    rc = VERR_NO_MEMORY;
+                rc = VDCFGQueryStringAlloc(pIfCfg, "TargetAddress", &pszAddress);
+                if (RT_SUCCESS(rc))
+                {
+                    /** @todo think about a nicer looking location scheme for iSCSI */
+                    if (RTStrAPrintf(pszName, "%s/%s/%s",
+                                     pszAddress, pszTarget, pszLUN) < 0)
+                        rc = VERR_NO_MEMORY;
+
+                    RTMemFree(pszAddress);
+                }
+                RTMemFree(pszLUN);
             }
-        }
-    }
-    RTMemFree(pszTarget);
-    RTMemFree(pszLUN);
-    RTMemFree(pszAddress);
+            RTMemFree(pszTarget);
+        }
+    }
+    else
+        rc = VERR_INVALID_PARAMETER;
 
     return rc;

trunk/src/VBox/Storage/VISO.cpp

@@ -674 +674 @@
         if (fDelete)
         {
-                PVDINTERFACECONFIG pImgCfg = VDIfConfigGet(&pThis->pIfIo->Core);
-
+            PVDINTERFACECONFIG pImgCfg = VDIfConfigGet(&pThis->pIfIo->Core);
+            if (pImgCfg)
+            {
                 bool fUnattendedInstall = false;
                 int vrc = VDCFGQueryBool(pImgCfg, "UnattendedInstall", &fUnattendedInstall);
@@ -686 +687 @@
                 if (RT_SUCCESS(vrc) && fUnattendedInstall)
                     deleteReferences(pThis);
+            }
+
             vdIfIoIntFileDelete(pThis->pIfIo, pThis->pszFilename);
         }