Changeset 34039 in vbox

Timestamp:

Nov 12, 2010 6:51:25 PM (14 years ago)

Author:

vboxsync

Message:

NAT: if_encap doesn't allocate intermediate buffer, IP-fragmentation shouldn't allow appear them on the bottom of the stack.

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (2 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -1550 +1550 @@
     m->m_len += ETH_HLEN;
     eh = mtod(m, struct ethhdr *);
-    mlen = m_length(m, NULL);
+    mlen = m->m_len;//m_length(m, NULL);
 
     if (memcmp(eh->h_source, special_ethaddr, ETH_ALEN) != 0)
@@ -1564 +1564 @@
         }
     }
-    if (m->m_next)
-    {
-        buf = RTMemAlloc(mlen);
-        if (!buf)
-        {
-            Log(("NAT: Can't alloc memory for outgoing buffer\n"));
-            m_freem(pData, m);
-            goto done;
-        }
-        mbuf = buf;
-        m_copydata(m, 0, mlen, (char *)buf);
-    }
-    else
-        mbuf = mtod(m, uint8_t *);
+    /*
+     * we're processing the chain, that isn't not expected.
+     */
+    Assert((!m->m_next));
+    mbuf = mtod(m, uint8_t *);
     eh->h_proto = RT_H2N_U16(eth_proto);
     if (flags & ETH_ENCAP_URG)