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, 0 deletions

diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 7afab70..631b2e8 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -37,6 +37,7 @@
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mbuf.h>
+#include <sys/mutex.h>
 #include <sys/protosw.h>
 #include <sys/signalvar.h>
 #include <sys/socket.h>
@@ -105,7 +106,9 @@ raw_input(m0, proto, src, dst)
 					/* should notify about lost packet */
 					m_freem(n);
 				else {
+					SOCK_LOCK(last);
 					sorwakeup(last);
+					SOCK_UNLOCK(last);
 					sockets++;
 				}
 			}
@@ -117,7 +120,9 @@ raw_input(m0, proto, src, dst)
 		    m, (struct mbuf *)0) == 0)
 			m_freem(m);
 		else {
+			SOCK_LOCK(last);
 			sorwakeup(last);
+			SOCK_UNLOCK(last);
 			sockets++;
 		}
 	} else
@@ -145,8 +150,11 @@ raw_uabort(struct socket *so)
 	if (rp == 0)
 		return EINVAL;
 	raw_disconnect(rp);
+	SOCK_LOCK(so);
 	sotryfree(so);
+	SOCK_LOCK(so);
 	soisdisconnected(so);	/* XXX huh? called after the sofree()? */
+	SOCK_UNLOCK(so);
 	return 0;
 }
 
@@ -203,7 +211,9 @@ raw_udisconnect(struct socket *so)
 		return ENOTCONN;
 	}
 	raw_disconnect(rp);
+	SOCK_LOCK(so);
 	soisdisconnected(so);
+	SOCK_UNLOCK(so);
 	return 0;
 }