Changeset 100220 in vbox for trunk

Timestamp:

Jun 19, 2023 7:14:10 PM (18 months ago)

Author:

vboxsync

Message:

HostServices/SharedFolders/vbsf.cpp: Don't use the host page size when dealing with guest memory but use the VMMDEV_PAGE_* macros, fixes data corruption during reads and writes, bugref:10456

File:

• trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -42 +42 @@
 #include <VBox/AssertGuest.h>
 #include <VBox/param.h>
+#include <VBox/VMMDev.h>
 #include <iprt/alloc.h>
 #include <iprt/assert.h>
@@ -1229 +1230 @@
             Assert(iPage < pPages->cPages);
 
+            /** @todo r=aeichner This was just using PAGE_SIZE before which doesn't work if the host and guest use different
+             * page sizes (think of 16KiB on macOS.arm64 vs linux.arm64) causing data corruption, yay! VMMDev now imposes a page size of 4KiB and
+             * VBOXHGCMSVCPARMPAGES should really have a cbPage member to indicate the used page size instead of dragging
+             * in VMMDev.h here. OTOH the size of VBOXHGCMSVCPARMPAGES can be part of a saved state which would mean increasing
+             * the HGCM saved state version... */
+
             /* Current page. */
             void *pvSeg;
             paSegs[iSeg].pvSeg = pvSeg = pPages->papvPages[iPage];
-            uint32_t cbSeg = PAGE_SIZE - (uint32_t)((uintptr_t)pvSeg & PAGE_OFFSET_MASK);
+            uint32_t cbSeg = VMMDEV_PAGE_SIZE - (uint32_t)((uintptr_t)pvSeg & VMMDEV_PAGE_OFFSET_MASK);
             iPage++;
 
@@ -1240 +1247 @@
             {
                 iPage++;
-                cbSeg += PAGE_SIZE;
+                cbSeg += VMMDEV_PAGE_SIZE;
             }