From 882e68c8a923e55af6d00279430fe839f983e341 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Thu, 4 Sep 1997 17:39:16 +0000 Subject: [PATCH] sonewconn no longer passes curproc to the protocol attach method since that might cause in_pcballoc to call MALLOC with M_WAITOK during a software interrupt. Reviewed by: Garrett Wollman --- sys/kern/uipc_sockbuf.c | 4 ++-- sys/kern/uipc_socket2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 5059cd503428..a366e4ed585c 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_socket2.c,v 1.27 1997/08/16 19:15:05 wollman Exp $ + * $Id: uipc_socket2.c,v 1.28 1997/09/02 20:05:57 bde Exp $ */ #include @@ -215,7 +215,7 @@ sonewconn(head, connstatus) so->so_pgid = head->so_pgid; (void) soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat); - if ((*so->so_proto->pr_usrreqs->pru_attach)(so, 0, curproc)) { /*XXX*/ + if ((*so->so_proto->pr_usrreqs->pru_attach)(so, 0, NULL)) { (void) free((caddr_t)so, M_SOCKET); return ((struct socket *)0); } diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 5059cd503428..a366e4ed585c 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_socket2.c,v 1.27 1997/08/16 19:15:05 wollman Exp $ + * $Id: uipc_socket2.c,v 1.28 1997/09/02 20:05:57 bde Exp $ */ #include @@ -215,7 +215,7 @@ sonewconn(head, connstatus) so->so_pgid = head->so_pgid; (void) soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat); - if ((*so->so_proto->pr_usrreqs->pru_attach)(so, 0, curproc)) { /*XXX*/ + if ((*so->so_proto->pr_usrreqs->pru_attach)(so, 0, NULL)) { (void) free((caddr_t)so, M_SOCKET); return ((struct socket *)0); }