Changeset 35923 in vbox for trunk/src/VBox/Devices/Network/slirp/ip_input.c

Timestamp:

Feb 10, 2011 3:48:27 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

69951

Message:

NAT: 'icmp_error` frees source mbuf.

File:

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

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

@@ -131 +131 @@
     {
         ipstat.ips_toosmall++;
-        STAM_PROFILE_STOP(&pData->StatIP_input, a);
-        return;
+        goto bad_free_m;
     }
 
@@ -194 +193 @@
     {
         icmp_error(pData, m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, 0, "ttl");
-        goto bad_free_m;
+        goto no_free_m;
     }
 
@@ -210 +209 @@
         m = ip_reass(pData, m);
         if (m == NULL)
-        {
-             STAM_PROFILE_STOP(&pData->StatIP_input, a);
-             return;
-        }
+            goto no_free_m;
         ip = mtod(m, struct ip *);
         hlen = ip->ip_hl << 2;
@@ -239 +235 @@
             m_freem(pData, m);
     }
-    STAM_PROFILE_STOP(&pData->StatIP_input, a);
-    return;
+    goto no_free_m;
 
 bad_free_m:
@@ -246 +241 @@
         &ip->ip_dst, ip->ip_len));
     m_freem(pData, m);
+no_free_m:
     STAM_PROFILE_STOP(&pData->StatIP_input, a);
     return;