Lock down a socket, milestone 1.

o Add a mutex (sb_mtx) to struct sockbuf. This protects the data in a
  socket buffer. The mutex in the receive buffer also protects the data
  in struct socket.

o Determine the lock strategy for each members in struct socket.

o Lock down the following members:

  - so_count
  - so_options
  - so_linger
  - so_state

o Remove *_locked() socket APIs.  Make the following socket APIs
  touching the members above now require a locked socket:

 - sodisconnect()
 - soisconnected()
 - soisconnecting()
 - soisdisconnected()
 - soisdisconnecting()
 - sofree()
 - soref()
 - sorele()
 - sorwakeup()
 - sotryfree()
 - sowakeup()
 - sowwakeup()

Reviewed by:	alfred

1 files changed, 8 insertions, 2 deletions

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 38332b2..f9994c6 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1941,8 +1941,11 @@ icmp6_rip6_input(mp, off)
 					if (opts) {
 						m_freem(opts);
 					}
-				} else
+				} else {
+					SOCK_LOCK(last->in6p_socket);
 					sorwakeup(last->in6p_socket);
+					SOCK_UNLOCK(last->in6p_socket);
+				}
 				opts = NULL;
 			}
 		}
@@ -1958,8 +1961,11 @@ icmp6_rip6_input(mp, off)
 			m_freem(m);
 			if (opts)
 				m_freem(opts);
-		} else
+		} else {
+			SOCK_LOCK(last->in6p_socket);
 			sorwakeup(last->in6p_socket);
+			SOCK_UNLOCK(last->in6p_socket);
+		}
 	} else {
 		m_freem(m);
 		ip6stat.ip6s_delivered--;