Changeset 85082 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 7, 2020 2:04:23 PM (5 years ago)

Author:

vboxsync

Message:

icmp_input: don't keep a mbuf reference after we pass it to a function
that consumes it.

File:

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

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

@@ -487 +487 @@
                 ip->ip_src.s_addr = dst;
                 icmp_reflect(pData, m);
+                m = NULL;       /* m was consumed and freed */
                 goto done;
             }
@@ -550 +551 @@
                     {
                         icmp_attach(pData, m);
-                        /* don't let m_freem at the end free atached buffer */
+                        m = NULL; /* m was stashed away for safekeeping */
                         goto done;
                     }
@@ -562 +563 @@
                     }
                     icmp_error(pData, m, ICMP_UNREACH, ICMP_UNREACH_NET, 0, strerror(errno));
+                    m = NULL;   /* m was consumed and freed */
+                    goto done;
                 }
             }
@@ -585 +588 @@
 
 end_error_free_m:
-    m_freem(pData, m);
+    if (m != NULL)
+        m_freem(pData, m);
 
 done: