Changeset 87726 in vbox

Timestamp:

Feb 11, 2021 9:29:13 PM (4 years ago)

Author:

vboxsync

Message:

Devices/Serial/UartCore: Fix lock order violation when in disconnected mode

File:

• trunk/src/VBox/Devices/Serial/UartCore.cpp (modified) (2 diffs)

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

@@ -859 +859 @@
     if (fNotifyDrv)
     {
+        /* Leave the device critical section before calling into the lower driver. */
+        PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
+
         if (   pThisCC->pDrvSerial
             && !(pThis->uRegMcr & UART_REG_MCR_LOOP))
         {
-            /* Leave the device critical section before calling into the lower driver. */
-            PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
             int rc2 = pThisCC->pDrvSerial->pfnDataAvailWrNotify(pThisCC->pDrvSerial);
             if (RT_FAILURE(rc2))
                 LogRelMax(10, ("Serial#%d: Failed to send data with %Rrc\n", pDevIns->iInstance, rc2));
-            PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_SUCCESS);
         }
         else
             PDMDevHlpTimerSetRelative(pDevIns, pThis->hTimerTxUnconnected, pThis->cSymbolXferTicks, NULL);
+
+        PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_SUCCESS);
     }
 #endif
@@ -1417 +1419 @@
                 break;
             case UART_REG_SCR_INDEX:
-                pThis->uRegScr = u32;
+                pThis->uRegScr = uVal;
                 break;
             default: