Changeset 105751 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Aug 21, 2024 9:51:08 AM (6 months ago)

Author:

vboxsync

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

164463

Message:

VMMDev,Vbgl: Extend the VMMDevReq_HGCMCancel2 request to take a full 64-bit physical address. This should be backwards compatible. bugref:10456

File:

• trunk/src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -2001 +2001 @@
 static int vmmdevReqHandler_HGCMCancel2(PVMMDEVCC pThisCC, VMMDevRequestHeader *pReqHdr)
 {
-    VMMDevHGCMCancel2 *pReq = (VMMDevHGCMCancel2 *)pReqHdr;
-    AssertMsgReturn(pReq->header.size >= sizeof(*pReq), ("%u\n", pReq->header.size), VERR_INVALID_PARAMETER);  /** @todo Not sure why this >= ... */
+    /* Note! Using '>=' for the size check because that simplifies amending the
+             structure (like we did already) */
+    RTGCPHYS GCPhysReqToCancel;
+    if (pReqHdr->size >= sizeof(VMMDevHGCMCancel2))
+        GCPhysReqToCancel = ((VMMDevHGCMCancel2 const *)pReqHdr)->physReqToCancel;
+    else if (pReqHdr->size == sizeof(VMMDevHGCMCancel2Old))
+        GCPhysReqToCancel = ((VMMDevHGCMCancel2Old const *)pReqHdr)->physReqToCancel;
+    else
+        AssertMsgFailedReturn(("%u\n", pReqHdr->size), VERR_INVALID_PARAMETER);
+    RT_UNTRUSTED_VALIDATED_FENCE();
 
     if (pThisCC->pHGCMDrv)
     {
-        Log(("VMMDevReq_HGCMCancel2\n"));
-        return vmmdevR3HgcmCancel2(pThisCC, pReq->physReqToCancel);
+        Log(("VMMDevReq_HGCMCancel2: %RGp\n", GCPhysReqToCancel));
+        return vmmdevR3HgcmCancel2(pThisCC, GCPhysReqToCancel);
     }