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, 5 insertions, 1 deletions

diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c
index 68f1045..c69af30 100644
--- a/sys/netkey/keysock.c
+++ b/sys/netkey/keysock.c
@@ -174,7 +174,9 @@ key_sendup0(rp, m, promisc)
 		error = ENOBUFS;
 	} else
 		error = 0;
+	SOCK_LOCK(rp->rcb_socket);
 	sorwakeup(rp->rcb_socket);
+	SOCK_UNLOCK(rp->rcb_socket);
 	return error;
 }
 
@@ -427,8 +429,10 @@ key_attach(struct socket *so, int proto, struct thread *td)
 	key_cb.any_count++;
 	kp->kp_raw.rcb_laddr = &key_src;
 	kp->kp_raw.rcb_faddr = &key_dst;
-	soisconnected_locked(so);
+	SOCK_LOCK(so);
+	soisconnected(so);
 	so->so_options |= SO_USELOOPBACK;
+	SOCK_UNLOCK(so);
 
 	splx(s);
 	return 0;