Changeset 75122 in vbox for trunk

Timestamp:

Oct 27, 2018 5:53:48 PM (6 years ago)

Author:

vboxsync

Message:

VBoxNetAdp: Same fixes for bugref:9233 ticketref:18046 as was applied to VBoxNetLwf.

Location:

trunk/src/VBox/HostDrivers

Files:

• VBoxNetAdp/win/VBoxNetAdp-win.cpp (modified) (5 diffs)
• VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.cpp

@@ -476 +476 @@
 }
 
+/**
+ * Worker for vboxNetAdpWinNBtoSG() that gets the max segment count needed.
+ * @note vboxNetAdpWinNBtoSG may use fewer depending on cbPacket and offset!
+ * @note vboxNetLwfWinCalcSegments() is a copy of this code.
+ */
 DECLINLINE(ULONG) vboxNetAdpWinCalcSegments(PNET_BUFFER pNetBuf)
 {
     ULONG cSegs = 0;
     for (PMDL pMdl = NET_BUFFER_CURRENT_MDL(pNetBuf); pMdl; pMdl = NDIS_MDL_LINKAGE(pMdl))
-        cSegs++;
+    {
+        /* Skip empty MDLs (see @bugref{9233}) */
+        if (MmGetMdlByteCount(pMdl))
+            cSegs++;
+    }
     return cSegs;
 }
 
+/**
+ * @note vboxNetLwfWinNBtoSG() is a copy of this code.
+ */
 DECLHIDDEN(PINTNETSG) vboxNetAdpWinNBtoSG(PVBOXNETADP_ADAPTER pThis, PNET_BUFFER pNetBuf)
 {
     ULONG cbPacket = NET_BUFFER_DATA_LENGTH(pNetBuf);
-    UINT cSegs = vboxNetAdpWinCalcSegments(pNetBuf);
+    ULONG cSegs = vboxNetAdpWinCalcSegments(pNetBuf);
     /* Allocate and initialize SG */
     PINTNETSG pSG = (PINTNETSG)NdisAllocateMemoryWithTagPriority(pThis->hAdapter,
@@ -497 +509 @@
     IntNetSgInitTempSegs(pSG, cbPacket /*cbTotal*/, cSegs, cSegs /*cSegsUsed*/);
 
-    int rc = NDIS_STATUS_SUCCESS;
     ULONG uOffset = NET_BUFFER_CURRENT_MDL_OFFSET(pNetBuf);
     cSegs = 0;
@@ -504 +515 @@
          pMdl = NDIS_MDL_LINKAGE(pMdl))
     {
+        ULONG cbSrc = MmGetMdlByteCount(pMdl);
+        if (cbSrc == 0)
+            continue; /* Skip empty MDLs (see @bugref{9233}) */
+
         PUCHAR pSrc = (PUCHAR)MmGetSystemAddressForMdlSafe(pMdl, LowPagePriority);
         if (!pSrc)
         {
-            rc = NDIS_STATUS_RESOURCES;
-            break;
-        }
-        ULONG cbSrc = MmGetMdlByteCount(pMdl);
-        if (uOffset)
-        {
-            Assert(uOffset < cbSrc);
-            pSrc  += uOffset;
-            cbSrc -= uOffset;
-            uOffset = 0;
+            vboxNetAdpWinDestroySG(pSG);
+            return NULL;
         }
 
@@ -522 +529 @@
             cbSrc = cbPacket;
 
+        if (uOffset)
+        {
+            if (uOffset < cbSrc)
+            {
+                pSrc  += uOffset;
+                cbSrc -= uOffset;
+                uOffset = 0;
+            }
+            else
+            {
+                uOffset -= cbSrc;
+                continue;
+            }
+        }
+
+        Assert(cSegs < pSG->cSegsAlloc);
         pSG->aSegs[cSegs].pv = pSrc;
         pSG->aSegs[cSegs].cb = cbSrc;
@@ -529 +552 @@
     }
 
-    Assert(cSegs <= pSG->cSegsAlloc);
-
-    if (RT_FAILURE(rc))
-    {
-        vboxNetAdpWinDestroySG(pSG);
-        pSG = NULL;
-    }
-    else
-    {
-        Assert(cbPacket == 0);
-        Assert(pSG->cSegsUsed == cSegs);
-    }
+    Assert(cbPacket == 0);
+    Assert(cSegs <= pSG->cSegsUsed);
+
+    /* Update actual segment count in case we used fewer than anticipated. */
+    pSG->cSegsUsed = (uint16_t)cSegs;
+
     return pSG;
 }

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp

@@ -1391 +1391 @@
 /**
  * Worker for vboxNetLwfWinNBtoSG() that gets the max segment count needed.
- * @note  vboxNetLwfWinNBtoSG may use fewer depending on cbPacket and offset!
+ * @note vboxNetLwfWinNBtoSG may use fewer depending on cbPacket and offset!
+ * @note vboxNetAdpWinCalcSegments() is a copy of this code.
  */
 DECLINLINE(ULONG) vboxNetLwfWinCalcSegments(PNET_BUFFER pNetBuf)
@@ -1599 +1600 @@
 }
 
+/**
+ * @note vboxNetAdpWinNBtoSG() is a copy of this code.
+ */
 static PINTNETSG vboxNetLwfWinNBtoSG(PVBOXNETLWF_MODULE pModule, PNET_BUFFER pNetBuf)
 {