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, 10 insertions, 3 deletions

diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 0dac2e5..21bb1be 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -35,11 +35,13 @@
  */
 
 #include <sys/param.h>
+#include <sys/domain.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 
 #include <net/raw_cb.h>
 
@@ -97,6 +99,7 @@ raw_detach(rp)
 	struct socket *so = rp->rcb_socket;
 
 	so->so_pcb = 0;
+	SOCK_LOCK(so);
 	sotryfree(so);
 	LIST_REMOVE(rp, list);
 #ifdef notdef
@@ -120,8 +123,12 @@ raw_disconnect(rp)
 		m_freem(dtom(rp->rcb_faddr));
 	rp->rcb_faddr = 0;
 #endif
-	if (rp->rcb_socket->so_state & SS_NOFDREF)
+	SOCK_LOCK(rp->rcb_socket);
+	if (rp->rcb_socket->so_state & SS_NOFDREF) {
+		SOCK_UNLOCK(rp->rcb_socket);
 		raw_detach(rp);
+	} else
+		SOCK_UNLOCK(rp->rcb_socket);
 }
 
 #ifdef notdef