Changeset 53308 in vbox for trunk/src/VBox/Devices/Network/slirp/bsd/kern

Timestamp:

Nov 12, 2014 3:00:16 AM (10 years ago)

Author:

vboxsync

Message:

NAT: m_adj() - when truncating by exactly the length of the last mbuf
in a chain, don't leave that last mbuf around with m_len set to 0.
Fragmentation code in ip_output0() sending a chain of two mbufs
triggers this for the first fragment and if_encap() drops it thinking
it was passed a chain (or triggers an assertion in a debug build).

File:

• trunk/src/VBox/Devices/Network/slirp/bsd/kern/uipc_mbuf.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/slirp/bsd/kern/uipc_mbuf.c

@@ -1101 +1101 @@
                         m = m->m_next;
                 }
-                if (m->m_len >= len) {
+                if (m->m_len > len || (m->m_len == len && m == mp)) {
                         m->m_len -= len;
                         if (mp->m_flags & M_PKTHDR)