diff options
| author | tegge <tegge@FreeBSD.org> | 1997-09-04 17:39:16 +0000 |
|---|---|---|
| committer | tegge <tegge@FreeBSD.org> | 1997-09-04 17:39:16 +0000 |
| commit | b238b1d359202fce1020753b2e57b8bb25a28360 (patch) | |
| tree | ac27d496d31e42b39ceaabbc1eae6f51f7840818 /sys/kern | |
| parent | a334d7c623282639c708cd1c168f694eeb134ab7 (diff) | |
| download | FreeBSD-src-b238b1d359202fce1020753b2e57b8bb25a28360.zip FreeBSD-src-b238b1d359202fce1020753b2e57b8bb25a28360.tar.gz | |
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 <wollman@khavrinen.lcs.mit.edu>
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_sockbuf.c | 4 | ||||
| -rw-r--r-- | 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 5059cd5..a366e4e 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 <sys/param.h> @@ -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 5059cd5..a366e4e 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 <sys/param.h> @@ -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); } |
