Changeset 102827 in vbox for trunk/src

Timestamp:

Jan 10, 2024 8:24:37 PM (13 months ago)

Author:

vboxsync

Message:

Devices/VirtioCore, Devices/VirtioNet: Correct check, bugref:10566

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet.cpp (modified) (1 diff)
• VirtIO/VirtioCore.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

@@ -2807 +2807 @@
                     uint64_t srcSgCur   = (uint64_t)pSgPhysSend->GCPhysCur;
                     cbCopied = RT_MIN((uint64_t)cbRemain, srcSgLen - (srcSgCur - srcSgStart));
+                    /*
+                     * Guest sent a bogus S/G chain, there doesn't seem to be a way to report an error but
+                     * as this shouldn't happen anyway we just stop proccessing this chain.
+                     */
+                    if (RT_UNLIKELY(!cbCopied))
+                        break;
                     virtioCoreGCPhysRead(pVirtio, pDevIns,
                                          (RTGCPHYS)pSgPhysSend->GCPhysCur,

trunk/src/VBox/Devices/VirtIO/VirtioCore.cpp

@@ -985 +985 @@
         {
             cbCopy = RT_MIN(pSgVirtReturn->cbSegLeft,  pSgPhysReturn->cbSegLeft);
-            Assert(cbCopy > 0);
+            AssertReturn(cbCopy > 0, VERR_INVALID_PARAMETER);
             virtioCoreGCPhysWrite(pVirtio, pDevIns, (RTGCPHYS)pSgPhysReturn->GCPhysCur, pSgVirtReturn->pvSegCur, cbCopy);
             RTSgBufAdvance(pSgVirtReturn, cbCopy);