D24842.id71799.diff
No OneTemporary
Actions

Size

763 B

Referenced Files

None

Subscribers

None

D24842.id71799.diff
View Options

	Index: head/sys/kern/uipc_socket.c
	===================================================================
	--- head/sys/kern/uipc_socket.c
	+++ head/sys/kern/uipc_socket.c
	@@ -4016,8 +4016,17 @@
	{

	SOCK_LOCK(so);
	- so->so_state &= ~(SS_ISCONNECTING\|SS_ISCONNECTED\|SS_ISDISCONNECTING);
	+
	+ /*
	+ * There is at least one reader of so_state that does not
	+ * acquire socket lock, namely soreceive_generic(). Ensure
	+ * that it never sees all flags that track connection status
	+ * cleared, by ordering the update with a barrier semantic of
	+ * our release thread fence.
	+ */
	so->so_state \|= SS_ISDISCONNECTED;
	+ atomic_thread_fence_rel();
	+ so->so_state &= ~(SS_ISCONNECTING\|SS_ISCONNECTED\|SS_ISDISCONNECTING);

	if (!SOLISTENING(so)) {
	SOCK_UNLOCK(so);