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

Timestamp:

Jun 1, 2019 12:23:46 PM (6 years ago)

Author:

vboxsync

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

131028

Message:

Devices/DevAHCI: Fix possible memory leak while still maintaining the requirement that the pszDesc parameter passed to PDMDevHlpDriverAttach() needs to be valid over the devices lifetime

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (15 diffs)

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

@@ -405 +405 @@
     /** Pointer to the attached driver's extended interface. */
     R3PTRTYPE(PPDMIMEDIAEX)         pDrvMediaEx;
+    /** Port description. */
+    R3PTRTYPE(char *)               pszDesc;
     /** The base interface. */
     PDMIBASE                        IBase;
@@ -416 +418 @@
     PDMLED                          Led;
 
+#if HC_ARCH_BITS == 64
     uint32_t                        u32Alignment3;
+#endif
 
     /** Async IO Thread. */
@@ -2459 +2463 @@
      * handling 2nd DWORD failures on split accesses correctly. */
     int rc = PDMDevHlpMMIORegister(pDevIns, GCPhysAddress, cb, NULL /*pvUser*/,
-                                   IOMMMIO_FLAGS_READ_DWORD | IOMMMIO_FLAGS_WRITE_ONLY_DWORD_QWORD,
+                                   IOMMMIO_FLAGS_READ_DWORD | IOMMMIO_FLAGS_WRITE_DWORD_QWORD_READ_MISSING,
                                    ahciMMIOWrite, ahciMMIORead, "AHCI");
     if (RT_FAILURE(rc))
@@ -5686 +5690 @@
      * required as well as optional.
      */
-    rc = PDMDevHlpDriverAttach(pDevIns, pAhciPort->iLUN, &pAhciPort->IBase, &pAhciPort->pDrvBase, NULL);
+    rc = PDMDevHlpDriverAttach(pDevIns, pAhciPort->iLUN, &pAhciPort->IBase, &pAhciPort->pDrvBase, pAhciPort->pszDesc);
     if (RT_SUCCESS(rc))
         rc = ahciR3ConfigureLUN(pDevIns, pAhciPort);
@@ -5699 +5703 @@
     else
     {
-        char szName[24];
-        RTStrPrintf(szName, sizeof(szName), "Port%d", iLUN);
-
         rc = SUPSemEventCreate(pThis->pSupDrvSession, &pAhciPort->hEvtProcess);
         if (RT_FAILURE(rc))
@@ -5709 +5710 @@
         /* Create the async IO thread. */
         rc = PDMDevHlpThreadCreate(pDevIns, &pAhciPort->pAsyncIOThread, pAhciPort, ahciAsyncIOLoop, ahciAsyncIOLoopWakeUp, 0,
-                                   RTTHREADTYPE_IO, szName);
+                                   RTTHREADTYPE_IO, pAhciPort->pszDesc);
         if (RT_FAILURE(rc))
             return rc;
@@ -5717 +5718 @@
          */
         if (RT_SUCCESS(rc))
-            rc = ahciR3VpdInit(pDevIns, pAhciPort, szName);
+            rc = ahciR3VpdInit(pDevIns, pAhciPort, pAhciPort->pszDesc);
 
         /* Inform the guest about the added device in case of hotplugging. */
@@ -5852 +5853 @@
                 pAhciPort->hEvtProcess = NIL_SUPSEMEVENT;
             }
+
+            if (pAhciPort->pszDesc)
+                RTStrFree(pAhciPort->pszDesc);
         }
 
@@ -6113 +6117 @@
     for (i = 0; i < pThis->cPortsImpl; i++)
     {
-        char *pszName;
-        if (RTStrAPrintf(&pszName, "Port%u", i) <= 0)
+        PAHCIPort pAhciPort      = &pThis->ahciPort[i];
+
+        if (RTStrAPrintf(&pAhciPort->pszDesc, "Port%u", i) <= 0)
             AssertLogRelFailedReturn(VERR_NO_MEMORY);
 
-        PAHCIPort pAhciPort      = &pThis->ahciPort[i];
         /*
          * Init interfaces.
@@ -6134 +6138 @@
 
         /* Query per port configuration options if available. */
-        PCFGMNODE pCfgPort = CFGMR3GetChild(pDevIns->pCfg, pszName);
+        PCFGMNODE pCfgPort = CFGMR3GetChild(pDevIns->pCfg, pAhciPort->pszDesc);
         if (pCfgPort)
         {
@@ -6146 +6150 @@
          * Attach the block driver
          */
-        rc = PDMDevHlpDriverAttach(pDevIns, pAhciPort->iLUN, &pAhciPort->IBase, &pAhciPort->pDrvBase, pszName);
+        rc = PDMDevHlpDriverAttach(pDevIns, pAhciPort->iLUN, &pAhciPort->IBase, &pAhciPort->pDrvBase, pAhciPort->pszDesc);
         if (RT_SUCCESS(rc))
         {
@@ -6152 +6156 @@
             if (RT_FAILURE(rc))
             {
-                Log(("%s: Failed to configure the %s.\n", __FUNCTION__, pszName));
+                Log(("%s: Failed to configure the %s.\n", __FUNCTION__, pAhciPort->pszDesc));
                 return rc;
             }
@@ -6163 +6167 @@
              * Init vendor product data.
              */
-            rc = ahciR3VpdInit(pDevIns, pAhciPort, pszName);
+            rc = ahciR3VpdInit(pDevIns, pAhciPort, pAhciPort->pszDesc);
             if (RT_FAILURE(rc))
                 return rc;
@@ -6173 +6177 @@
 
             rc = PDMDevHlpThreadCreate(pDevIns, &pAhciPort->pAsyncIOThread, pAhciPort, ahciAsyncIOLoop,
-                                       ahciAsyncIOLoopWakeUp, 0, RTTHREADTYPE_IO, pszName);
+                                       ahciAsyncIOLoopWakeUp, 0, RTTHREADTYPE_IO, pAhciPort->pszDesc);
             if (RT_FAILURE(rc))
                 return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
-                                           N_("AHCI: Failed to create worker thread %s"), pszName);
+                                           N_("AHCI: Failed to create worker thread %s"), pAhciPort->pszDesc);
         }
         else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
@@ -6182 +6186 @@
             pAhciPort->pDrvBase = NULL;
             rc = VINF_SUCCESS;
-            LogRel(("AHCI: %s: No driver attached\n", pszName));
+            LogRel(("AHCI: %s: No driver attached\n", pAhciPort->pszDesc));
         }
         else
             return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
-                                       N_("AHCI: Failed to attach drive to %s"), pszName);
+                                       N_("AHCI: Failed to attach drive to %s"), pAhciPort->pszDesc);
     }