Changeset 77272 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Feb 12, 2019 12:04:57 PM (6 years ago)

Author:

vboxsync

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

128785

Message:

NetLwf: (bugref:8976) Odd-length packets are aligned properly, but no longer padded.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp (modified) (2 diffs)

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

@@ -1515 +1515 @@
     NET_BUFFER *pBuffer = NET_BUFFER_LIST_FIRST_NB(pBufList);
     NDIS_STATUS Status = NdisRetreatNetBufferDataStart(pBuffer, cbAlignedFrame, 0 /** @todo DataBackfill */, NULL);
+    if (cbAlignedFrame - pSG->cbTotal > 0)
+    {
+        /* Make sure padding zeros do not get to the wire. */
+        if (NET_BUFFER_DATA_LENGTH(pBuffer) != cbAlignedFrame)
+            vboxNetLwfLogErrorEvent(IO_ERR_INTERNAL_ERROR, STATUS_SUCCESS, 11);
+        else
+            NET_BUFFER_DATA_LENGTH(pBuffer) = pSG->cbTotal;
+    }
     if (Status == NDIS_STATUS_SUCCESS)
     {
@@ -1524 +1532 @@
                 NdisMoveMemory(pDst, pSG->aSegs[i].pv, pSG->aSegs[i].cb);
                 pDst += pSG->aSegs[i].cb;
-            }
-            if (cbAlignedFrame > pSG->cbTotal)
-            {
-                Log4(("vboxNetLwfWinSGtoNB: padding %d-byte packet with %d zero bytes", pSG->cbTotal, cbAlignedFrame - pSG->cbTotal));
-                NdisZeroMemory(pDst, cbAlignedFrame - pSG->cbTotal);
             }
             Log4(("vboxNetLwfWinSGtoNB: allocated NBL+NB 0x%p\n", pBufList));