Changeset 81218 in vbox

Timestamp:

Oct 10, 2019 4:10:59 PM (5 years ago)

Author:

vboxsync

Message:

Dev/E1000: Checksum and segmentation offloading validity checks.

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (4 diffs)

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

@@ -2433 +2433 @@
     }
     /* Compute checksum of complete packet */
-    uint16_t checksum = e1kCSum16(rxPacket + GET_BITS(RXCSUM, PCSS), cb);
+    size_t cbCSumStart = RT_MIN(GET_BITS(RXCSUM, PCSS), cb);
+    uint16_t checksum = e1kCSum16(rxPacket + cbCSumStart, cb - cbCSumStart);
     e1kRxChecksumOffload(pThis, rxPacket, cb, &status);
 
@@ -4247 +4248 @@
     E1kLog3(("%s e1kFallbackAddSegment: Length=%x, remaining payload=%x, header=%x, send=%RTbool\n",
              pThis->szPrf, u16Len, pThis->u32PayRemain, pThis->u16HdrRemain, fSend));
-    Assert(pThis->u32PayRemain + pThis->u16HdrRemain > 0);
+    AssertReturn(pThis->u32PayRemain + pThis->u16HdrRemain > 0, VINF_SUCCESS);
 
     if (pThis->u16TxPktLen + u16Len <= sizeof(pThis->aTxPacketFallback))
@@ -4286 +4287 @@
     }
 
-    pThis->u32PayRemain -= u16Len;
+    if (u16Len > pThis->u32PayRemain)
+        pThis->u32PayRemain = 0;
+    else
+        pThis->u32PayRemain -= u16Len;
 
     if (fSend)
@@ -4454 +4458 @@
 
     uint16_t u16MaxPktLen = pThis->contextTSE.dw3.u8HDRLEN + pThis->contextTSE.dw3.u16MSS;
+    /* We cannot produce empty packets, ignore all TX descriptors (see @bugref{9571}) */
+    if (u16MaxPktLen == 0)
+        return VINF_SUCCESS;
 
     /*