Changeset 75169 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Oct 30, 2018 6:29:31 AM (6 years ago)

Author:

vboxsync

Message:

Net/Win: bugref:9280 bugref:9233 Changed back the order of offset/truncate handling.

Location:

trunk/src/VBox/HostDrivers

Files:

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

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

@@ -526 +526 @@
         }
 
-        if (cbSrc > cbPacket)
-            cbSrc = cbPacket;
-
+        /* Handle the offset in the current (which is the first for us) MDL */
         if (uOffset)
         {
@@ -539 +537 @@
             else
             {
-                uOffset -= cbSrc;
-                continue;
+                /* This is an invalid MDL chain */
+                vboxNetAdpWinDestroySG(pSG);
+                return NULL;
             }
         }
+
+        /* Do not read the last MDL beyond packet's end */
+        if (cbSrc > cbPacket)
+            cbSrc = cbPacket;
 
         Assert(cSegs < pSG->cSegsAlloc);

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

@@ -1633 +1633 @@
         }
 
-        if (cbSrc > cbPacket)
-            cbSrc = cbPacket;
-
+        /* Handle the offset in the current (which is the first for us) MDL */
         if (uOffset)
         {
@@ -1646 +1644 @@
             else
             {
-                uOffset -= cbSrc;
-                continue;
+                /* This is an invalid MDL chain */
+                vboxNetLwfWinDestroySG(pSG);
+                return NULL;
             }
         }
+
+        /* Do not read the last MDL beyond packet's end */
+        if (cbSrc > cbPacket)
+            cbSrc = cbPacket;
 
         Assert(cSegs < pSG->cSegsAlloc);