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

diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 8f56d2c..e297390 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -228,8 +228,11 @@ divert_packet(struct mbuf *m, int incoming, int port)
 		if (sbappendaddr(&sa->so_rcv, (struct sockaddr *)&divsrc,
 				m, (struct mbuf *)0) == 0)
 			m_freem(m);
-		else
+		else {
+			SOCK_LOCK(sa);
 			sorwakeup(sa);
+			SOCK_UNLOCK(sa);
+		}
 	} else {
 		m_freem(m);
 		ipstat.ips_noproto++;
@@ -255,6 +258,7 @@ div_output(so, m, addr, control)
 	register struct ip *const ip = mtod(m, struct ip *);
 	struct sockaddr_in *sin = (struct sockaddr_in *)addr;
 	int error = 0;
+	int soopts;
 
 	if (control)
 		m_freem(control);		/* XXX */
@@ -300,8 +304,11 @@ div_output(so, m, addr, control)
 
 		/* Send packet to output processing */
 		ipstat.ips_rawout++;			/* XXX */
+		SOCK_LOCK(so);
+		soopts = so->so_options & SO_DONTROUTE;
+		SOCK_UNLOCK(so);
 		error = ip_output(m, inp->inp_options, &inp->inp_route,
-			(so->so_options & SO_DONTROUTE) |
+			soopts |
 			IP_ALLOWBROADCAST | IP_RAWOUTPUT,
 			inp->inp_moptions);
 	} else {
@@ -365,7 +372,9 @@ div_attach(struct socket *so, int proto, struct thread *td)
 	inp->inp_flags |= INP_HDRINCL;
 	/* The socket is always "connected" because
 	   we always know "where" to send the packet */
+	SOCK_LOCK(so);
 	so->so_state |= SS_ISCONNECTED;
+	SOCK_UNLOCK(so);
 	return 0;
 }
 
@@ -384,15 +393,21 @@ div_detach(struct socket *so)
 static int
 div_abort(struct socket *so)
 {
+	SOCK_LOCK(so);
 	soisdisconnected(so);
+	SOCK_UNLOCK(so);
 	return div_detach(so);
 }
 
 static int
 div_disconnect(struct socket *so)
 {
-	if ((so->so_state & SS_ISCONNECTED) == 0)
+	SOCK_LOCK(so);
+	if ((so->so_state & SS_ISCONNECTED) == 0) {
+		SOCK_UNLOCK(so);
 		return ENOTCONN;
+	}
+	SOCK_UNLOCK(so);
 	return div_abort(so);
 }