Changeset 82179 in vbox for trunk/src

Timestamp:

Nov 25, 2019 2:12:29 PM (5 years ago)

Author:

vboxsync

Message:

buslogic*Construct: NIL handles and assert NIL values in ring-0. bugref:9218

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (3 diffs)

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

@@ -4106 +4106 @@
      * Init instance data (do early because of constructor).
      */
+    pThis->hMmio       = NIL_IOMMMIOHANDLE;
+    pThis->hIoPortsIsa = NIL_IOMIOPORTHANDLE;
+    pThis->hIoPortsPci = NIL_IOMIOPORTHANDLE;
     pThisCC->pDevIns = pDevIns;
     pThisCC->IBase.pfnQueryInterface = buslogicR3StatusQueryInterface;
@@ -4356 +4359 @@
     PBUSLOGIC pThis = PDMDEVINS_2_DATA(pDevIns, PBUSLOGIC);
 
-    if (!pThis->uIsaIrq) {
+    if (!pThis->uIsaIrq)
+    {
+        Assert(pThis->hIoPortsIsa == NIL_IOMIOPORTHANDLE);
+
         int rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortsPci, buslogicIOPortWrite, buslogicIOPortRead, NULL /*pvUser*/);
         AssertRCReturn(rc, rc);
@@ -4365 +4371 @@
     else
     {
+        Assert(pThis->hIoPortsPci == NIL_IOMIOPORTHANDLE);
+        Assert(pThis->hMmio       == NIL_IOMMMIOHANDLE);
+
         int rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortsIsa, buslogicIOPortWrite, buslogicIOPortRead, NULL /*pvUser*/);
         AssertRCReturn(rc, rc);