Changeset 39679 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Dec 27, 2011 9:14:19 PM (13 years ago)

Author:

vboxsync

Message:

AsyncCompletion: Check that reads are always in the file limits and return an error before starting I/O

File:

• trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp

@@ -1097 +1097 @@
                  pTask, pEndpoint, off, paSegments, cSegments, cbRead));
 
+    if (RT_UNLIKELY(off + cbRead > pEpFile->cbFile))
+        return VERR_EOF;
+
     STAM_PROFILE_ADV_START(&pEpFile->StatRead, Read);
     pdmacFileEpTaskInit(pTask, cbRead);
@@ -1163 +1166 @@
 static int pdmacFileEpSetSize(PPDMASYNCCOMPLETIONENDPOINT pEndpoint, uint64_t cbSize)
 {
+    int rc;
     PPDMASYNCCOMPLETIONENDPOINTFILE pEpFile = (PPDMASYNCCOMPLETIONENDPOINTFILE)pEndpoint;
 
-    ASMAtomicWriteU64(&pEpFile->cbFile, cbSize);
-    return RTFileSetSize(pEpFile->hFile, cbSize);
+    rc = RTFileSetSize(pEpFile->hFile, cbSize);
+    if (RT_SUCCESS(rc))
+        ASMAtomicWriteU64(&pEpFile->cbFile, cbSize);
+
+    return rc;
 }