Changeset 57651 in vbox for trunk

Timestamp:

Sep 8, 2015 2:45:56 AM (9 years ago)

Author:

vboxsync

Message:

NAT/Net: Fix a race on OS X and Windows (HAVE_TCP_POLLHUP == POLLIN).
r94443 broke assumption in pxtcp_pcb_sent() that pxtcp for which we
pull input is no longer registered with poll manager. It can still
beregistered for POLLOUT on these platforms.

File:

• trunk/src/VBox/NetworkServices/NAT/pxtcp.c (modified) (1 diff)

trunk/src/VBox/NetworkServices/NAT/pxtcp.c

@@ -2291 +2291 @@
                           __func__, pxtcp->sock, sockerr));
 
+#if HAVE_TCP_POLLHUP == POLLIN /* see counterpart in pxtcp_pmgr_pump() */
                 /*
-                 * Since we are pulling, pxtcp is no longer registered
-                 * with poll manager so we can kill it directly.
+                 * It may still be registered with poll manager for POLLOUT.
+                 */
+                pxtcp_chan_send_weak(POLLMGR_CHAN_PXTCP_RESET, pxtcp);
+                return ERR_OK;
+#else
+                /*
+                 * It is no longer registered with poll manager so we
+                 * can kill it directly.
                  */
                 pxtcp_pcb_reset_pxtcp(pxtcp);
                 return ERR_ABRT;
+#endif
             }
         }