Changeset 104225 in vbox for trunk/src/VBox/Devices/Serial/DevOxPcie958.cpp

Timestamp:

Apr 8, 2024 11:47:37 AM (10 months ago)

Author:

vboxsync

Message:

Devices/Serial/DevPcieOx958: Be more strict with what the emulation allows for access sizes, fix status code checks, bugref:10635

File:

• trunk/src/VBox/Devices/Serial/DevOxPcie958.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Serial/DevOxPcie958.cpp

@@ -251 +251 @@
     }
     else /* Access UART registers. */
-        rc = uartRegRead(pDevIns, &pUart->UartCore, &pUartCC->UartCore, offUartReg, (uint32_t *)pv, cb);
+    {
+        AssertReturn(cb == 1, VINF_IOM_MMIO_UNUSED_00);
+
+        uint32_t u32 = 0;
+        rc = uartRegRead(pDevIns, &pUart->UartCore, &pUartCC->UartCore, offUartReg, &u32, 1);
+        Assert(rc == VINF_SUCCESS || rc == VINF_IOM_R3_IOPORT_READ);
+
+        if (rc == VINF_SUCCESS)
+            *(uint8_t *)pv = (uint8_t)u32;
+        else if (rc == VERR_IOM_IOPORT_UNUSED)
+            rc = VINF_IOM_MMIO_UNUSED_00;
+        else if (rc == VINF_IOM_R3_IOPORT_READ)
+            rc = VINF_IOM_R3_MMIO_READ;
+    }
 
     return rc;
@@ -281 +294 @@
     }
     else /* Access UART registers. */
-        rc = uartRegWrite(pDevIns, &pUart->UartCore, &pUartCC->UartCore, offUartReg, *(const uint32_t *)pv, cb);
+    {
+        AssertReturn(cb == 1, VINF_SUCCESS);
+
+        rc = uartRegWrite(pDevIns, &pUart->UartCore, &pUartCC->UartCore, offUartReg, *(const uint8_t *)pv, 1);
+        Assert(rc == VINF_SUCCESS || rc == VINF_IOM_R3_IOPORT_WRITE);
+
+        if (rc == VINF_IOM_R3_IOPORT_WRITE)
+            rc = VINF_IOM_R3_MMIO_WRITE;
+    }
 
     return rc;
@@ -320 +341 @@
     if (off < OX958_REG_UART_REGION_OFFSET)
     {
+        AssertReturn(cb == 4, VINF_IOM_MMIO_UNUSED_00);
         uint32_t *pu32 = (uint32_t *)pv;
-        Assert(cb == 4);
 
         switch ((uint32_t)off)
@@ -361 +382 @@
             POX958UARTCC pUartCC = &pThisCC->aUarts[iUart];
             rc = ox958UartRegRead(pDevIns, pThis, pUart, pUartCC, offUartReg, pv, cb);
-            if (rc == VINF_IOM_R3_IOPORT_READ)
-                rc = VINF_IOM_R3_MMIO_READ;
         }
         else
@@ -384 +403 @@
     if (off < OX958_REG_UART_REGION_OFFSET)
     {
+        AssertReturn(cb == 4, VINF_SUCCESS);
         const uint32_t u32 = *(const uint32_t *)pv;
-        Assert(cb == 4);
 
         switch ((uint32_t)off)
@@ -421 +440 @@
             POX958UARTCC pUartCC = &pThisCC->aUarts[iUart];
             rc = ox958UartRegWrite(pDevIns, pThis, pUart, pUartCC, offUartReg, pv, cb);
-            if (rc == VINF_IOM_R3_IOPORT_WRITE)
-                rc = VINF_IOM_R3_MMIO_WRITE;
         }
     }