Changeset 28444 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Apr 19, 2010 7:41:36 AM (15 years ago)

Author:

vboxsync

Message:

NAT: tcp_close filter out listening sockets while freeing socket buffers, where we don't allocate socket buffers.
sofree asserts if sbuf is already freed (freed and assigned with NULL value) or NULL.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• sbuf.c (modified) (1 diff)
• tcp_subr.c (modified) (1 diff)

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

@@ -19 +19 @@
 sbfree(struct sbuf *sb)
 {
+    /*
+     * vvl: This assert to catch double frees. tcp_close filter out 
+     * listening sockets which pass NULLs here.   
+     */
+    Assert((sb->sb_data));
     RTMemFree(sb->sb_data);
     /** @todo bird: I'm seeing double frees here sometimes.  This NULL'ing is just a

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

@@ -289 +289 @@
         tcp_last_so = &tcb;
     closesocket(so->s);
-    sbfree(&so->so_rcv);
-    sbfree(&so->so_snd);
+    /* (vvl) opening listening socket we do not reserve sbufs for it */
+    if ((so->so_state & SS_FACCEPTCONN) == 0)
+    {
+        sbfree(&so->so_rcv);
+        sbfree(&so->so_snd);
+    }
     sofree(pData, so);
     SOCKET_UNLOCK(so);