Changeset 21076 in vbox for trunk/src/VBox

Timestamp:

Jun 30, 2009 3:19:04 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetFlt: some paranoia on message sizes.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -2863 +2863 @@
     }
 
+    LogFlow((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk returns %d.\n", fIsOurPacket));
     RTSemFastMutexRelease(pThis->u.s.hFastMtx);
     return fIsOurPacket;
@@ -2894 +2895 @@
      * Don't loopback packets we transmit to the wire.
      */
-    /** @todo maybe we need not check for loopback for INTNETTRUNKDIR_HOST case? */
     if (vboxNetFltSolarisIsOurMBlk(pThis, pPromiscStream, pMsg))
     {
         LogFlow((DEVICE_NAME ":Avoiding packet loopback.\n"));
         return VINF_SUCCESS;
+    }
+
+    /*
+     * Paranoia...
+     */
+    if (MBLKL(pMsg) < sizeof(RTNETETHERHDR))
+    {
+        size_t cbMsg = msgdsize(pMsg);
+        if (cbMsg < sizeof(RTNETETHERHDR))
+            return VINF_SUCCESS;
+
+        mblk_t *pFullMsg = allocb(cbMsg, BPRI_MED);
+        if (RT_LIKELY(pFullMsg))
+        {
+            mblk_t *pCur = pMsg;
+            while (pCur)
+            {
+                size_t cbBlock = MBLKL(pCur);
+                if (cbBlock > 0)
+                {
+                    bcopy(pCur->b_rptr, pFullMsg->b_wptr, cbBlock);
+                    pFullMsg->b_wptr += cbBlock;
+                }
+                pCur = pCur->b_cont;
+            }
+
+            freemsg(pMsg);
+            pMsg = pFullMsg;
+        }
+        else
+            return VERR_NO_MEMORY;
     }