Changeset 90449 in vbox

Timestamp:

Jul 31, 2021 12:58:29 AM (4 years ago)

Author:

vboxsync

Message:

VMM/PGM: PDMCritSectTryEnter return status must be checked in ring-3 too. bugref:6695

Location:

trunk

Files:

• include/VBox/vmm/pdmcritsect.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PDMAllCritSect.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmcritsect.h

@@ -76 +76 @@
 VMMDECL(DECL_CHECK_RETURN_NOT_R3(int))
                     PDMCritSectEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL);
-VMMDECL(DECL_CHECK_RETURN_NOT_R3(int))
+VMMDECL(DECL_CHECK_RETURN(int))
                     PDMCritSectTryEnter(PVMCC pVM, PPDMCRITSECT pCritSect);
-VMMDECL(DECL_CHECK_RETURN_NOT_R3(int))
+VMMDECL(DECL_CHECK_RETURN(int))
                     PDMCritSectTryEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL);
 VMMDECL(int)        PDMCritSectLeave(PVMCC pVM, PPDMCRITSECT pCritSect);

trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

@@ -645 +645 @@
  * @param   pCritSect   The critical section.
  */
-VMMDECL(DECL_CHECK_RETURN_NOT_R3(int)) PDMCritSectTryEnter(PVMCC pVM, PPDMCRITSECT pCritSect)
+VMMDECL(DECL_CHECK_RETURN(int)) PDMCritSectTryEnter(PVMCC pVM, PPDMCRITSECT pCritSect)
 {
 #ifndef PDMCRITSECT_STRICT
@@ -672 +672 @@
  *                              acquired from.  Optional.
  */
-VMMDECL(DECL_CHECK_RETURN_NOT_R3(int))
+VMMDECL(DECL_CHECK_RETURN(int))
 PDMCritSectTryEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL)
 {