Changeset 27447 in vbox for trunk/src/VBox

Timestamp:

Mar 17, 2010 2:14:00 PM (15 years ago)

Author:

vboxsync

Message:

NAT: ICMP sanity checks of matching ECHO-ECHOREPLY communication. mbuf expanding calculation was changed.

File:

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

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

@@ -1111 +1111 @@
 
     src = addr->sin_addr.s_addr;
+    if (type == ICMP_ECHOREPLY)
+    {
+        struct ip *ip0 = mtod(m, struct ip *);
+        struct icmp *icp0 = (struct icmp *)((char *)ip0 + (ip0->ip_hl << 2));
+        if (icp0->icmp_type != ICMP_ECHO)
+        {
+            Log(("NAT: we haven't found echo for this reply\n"));
+            return;
+        }
+        if (   (RT_N2H_U16(ip->ip_len) - hlen )
+            != (ip0->ip_len - (ip0->ip_hl << 2))) /* the IP header in the list is in host format */
+        {
+            Log(("NAT: ECHO lenght doesn't match ECHOREPLY\n"));
+            return;
+        }
+    }
 
     ip = mtod(m, struct ip *);
@@ -1138 +1154 @@
     {
         int size = m->m_size;
-        m_inc(m, len); /*increase the room of the mbuf up to len*/
+        /* we need involve ether header lenght into new buffer buffer calculation */
+        m_inc(m, if_maxlinkhdr + len - hlen + original_hlen); 
         if (size == m->m_size)
         {