Changeset 99989 in vbox for trunk/src/VBox/Runtime/common/dvm

Timestamp:

May 26, 2023 12:06:12 PM (21 months ago)

Author:

vboxsync

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

157651

Message:

IPRT/dvm: Use rtDvmDiskReadUnaligned rather than rtDvmDiskRead in the RTDVMFMTOPS::pfnVolumeRead implementations to avoid triggering assertion when RTCp and others reads files via the FAT file system driver.

Location:

trunk/src/VBox/Runtime/common/dvm

Files:

• dvmbsdlabel.cpp (modified) (1 diff)
• dvmgpt.cpp (modified) (1 diff)
• dvmmbr.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp

@@ -641 +641 @@
     AssertReturn(off + cbRead <= pVol->cbVolume, VERR_INVALID_PARAMETER);
 
-    return rtDvmDiskRead(pVol->pVolMgr->pDisk, pVol->offStart + off, pvBuf, cbRead);
+    return rtDvmDiskReadUnaligned(pVol->pVolMgr->pDisk, pVol->offStart + off, pvBuf, cbRead);
 }
 

trunk/src/VBox/Runtime/common/dvm/dvmgpt.cpp

@@ -689 +689 @@
     AssertReturn(off + cbRead <= pVol->cbVolume, VERR_INVALID_PARAMETER);
 
-    return rtDvmDiskRead(pVol->pVolMgr->pDisk, pVol->offStart + off, pvBuf, cbRead);
+    return rtDvmDiskReadUnaligned(pVol->pVolMgr->pDisk, pVol->offStart + off, pvBuf, cbRead);
 }
 

trunk/src/VBox/Runtime/common/dvm/dvmmbr.cpp

@@ -1003 +1003 @@
     AssertReturn(off + cbRead <= pVol->pEntry->cbPart, VERR_INVALID_PARAMETER);
 
-    return rtDvmDiskRead(pVol->pVolMgr->pDisk, pVol->pEntry->offPart + off, pvBuf, cbRead);
+    return rtDvmDiskReadUnaligned(pVol->pVolMgr->pDisk, pVol->pEntry->offPart + off, pvBuf, cbRead);
 }