diff options
| author |   mpi <mpi@openbsd.org> | 2017-05-15 12:26:00 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2017-05-15 12:26:00 +0000 |
| commit | 15ece216a76a558919b695fc79df35c449815136 (patch) | |
| tree | ee6357fa89a02f944bbca595fcfe89891120ebb1 /sys/kern/uipc_socket.c | |
| parent | clang warns on unused static const variables. Remove one such unused (diff) | |
| download | wireguard-openbsd-15ece216a76a558919b695fc79df35c449815136.tar.xz wireguard-openbsd-15ece216a76a558919b695fc79df35c449815136.zip | |
Enable the NET_LOCK(), take 3.
Recursions are still marked as XXXSMP.
ok deraadt@, bluhm@
Diffstat (limited to 'sys/kern/uipc_socket.c')
| -rw-r--r-- | sys/kern/uipc_socket.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 7716e576d7f..edb9618ec45 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.182 2017/04/02 23:40:08 deraadt Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.183 2017/05/15 12:26:00 mpi Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -1038,10 +1038,12 @@ sorflush(struct socket *so) { struct sockbuf *sb = &so->so_rcv; struct protosw *pr = so->so_proto; + sa_family_t af = pr->pr_domain->dom_family; struct sockbuf asb; sb->sb_flags |= SB_NOINTR; - sblock(sb, M_WAITOK, NULL); + sblock(sb, M_WAITOK, + (af != PF_LOCAL && af != PF_ROUTE) ? &netlock : NULL); socantrcvmore(so); sbunlock(sb); asb = *sb; |