Revert the change in revision 1.77 of kern/uipc_socket2.c. It is causing

a panic because the socket's state isn't as expected by sofree().

Discussed with: dillon, fenner

3 files changed, 3 insertions, 3 deletions

diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 239c408..9872c22 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -205,7 +205,7 @@ sonewconn(head, connstatus)
 #endif
 	if (soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat) ||
 	    (*so->so_proto->pr_usrreqs->pru_attach)(so, 0, NULL)) {
-		sotryfree(so);
+		sodealloc(so);
 		return ((struct socket *)0);
 	}
 
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 7a6c2b5..379b7e1 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -231,7 +231,7 @@ sobind(so, nam, td)
 	return (error);
 }
 
-static void
+void
 sodealloc(struct socket *so)
 {
 
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 239c408..9872c22 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -205,7 +205,7 @@ sonewconn(head, connstatus)
 #endif
 	if (soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat) ||
 	    (*so->so_proto->pr_usrreqs->pru_attach)(so, 0, NULL)) {
-		sotryfree(so);
+		sodealloc(so);
 		return ((struct socket *)0);
 	}