Changeset 17145 in vbox for trunk

Timestamp:

Feb 26, 2009 9:11:32 AM (16 years ago)

Author:

vboxsync

Message:

NAT: preventing attempt of double ICMP packet sends, causing crash.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_icmp.c (modified) (2 diffs)
• socket.c (modified) (3 diffs)
• tcp_input.c (modified) (1 diff)
• udp.c (modified) (1 diff)

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

@@ -252 +252 @@
     if (found == 1 && icm == NULL)
     {
+        if (so->so_state == SS_NOFDREF) 
+        {
+            /* socket is shutdowning we've already sent ICMP on it.*/
+            LogRel(("NAT: Received icmp on shutdowning socket (probably corresponding ICMP socket has been already sent)\n"));
+            return NULL;
+        }
         icm = RTMemAlloc(sizeof(struct icmp_msg));
         icm->im_m = so->so_m;
@@ -390 +396 @@
                                     errno, strerror(errno)));
                         icmp_error(pData, m, ICMP_UNREACH,ICMP_UNREACH_NET, 0, strerror(errno));
-                        m_free(pData, m);
                     }
                 }

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

@@ -550 +550 @@
             Log2((dfd," rx error, tx icmp ICMP_UNREACH:%i\n", code));
             icmp_error(pData, so->so_m, ICMP_UNREACH,code, 0,strerror(errno));
+            so->so_m = NULL;
             m_free(pData, m);
         }
@@ -1013 +1014 @@
                 code = (code != ~0 ? code : ICMP_UNREACH_PORT);
                 icmp_error(pData, so->so_m, ICMP_UNREACH, code, 0, "Error occurred!!!");
+                so->so_m = NULL;
                 break;
             case IP_SUCCESS: /* echo replied */
@@ -1097 +1099 @@
                     errno,strerror(errno)));
         icmp_error(pData, so->so_m, ICMP_UNREACH,code, 0,strerror(errno));
+        so->so_m = NULL;
     }
     else

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

@@ -762 +762 @@
                     *ip = save_ip;
                     icmp_error(pData, m, ICMP_UNREACH,code, 0,strerror(errno));
+                    tp->t_socket->so_m = NULL;
                 }
                 tp = tcp_close(pData, tp);

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

@@ -252 +252 @@
         DEBUG_MISC((dfd,"udp tx errno = %d-%s\n", errno, strerror(errno)));
         icmp_error(pData, m, ICMP_UNREACH,ICMP_UNREACH_NET, 0, strerror(errno));
+        /* in case we receive ICMP on this socket we'll aware that ICMP has been already sent to host*/
+        so->so_m = NULL; 
     }