diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2012-09-19 20:00:33 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2012-09-19 20:00:33 +0000 |
| commit | 297ba8a9eb689f037d1a422fb5973b67ac108461 (patch) | |
| tree | e636bf2fc94daa5393a69cc6e01584e63a637354 /sys | |
| parent | 726d16825c16334c15f21f23f2b14062e4fc151a (diff) | |
When a socket is spliced, it may not wakeup the userland for reading.
There was a small race in sorwakeup() where that could happen if
we slept before the SB_SPLICE flag was set.
ok claudio@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/uipc_socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index ff2a79bcf35..6724bd4aaca 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.106 2012/09/19 19:41:29 bluhm Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.107 2012/09/19 20:00:32 bluhm Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -1337,10 +1337,10 @@ void sorwakeup(struct socket *so) { #ifdef SOCKET_SPLICE - if (so->so_rcv.sb_flags & SB_SPLICE) { + if (so->so_rcv.sb_flags & SB_SPLICE) (void) somove(so, M_DONTWAIT); + if (so->so_splice) return; - } #endif sowakeup(so, &so->so_rcv); if (so->so_upcall) |