diff options
| author |   mpi <mpi@openbsd.org> | 2017-07-08 09:19:02 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2017-07-08 09:19:02 +0000 |
| commit | 9da3575e51acd695cb33e5a319251ce88c518064 (patch) | |
| tree | 53b0734022ac0ca2b110718e1ab29adfc630a1d2 /sys/kern/uipc_socket.c | |
| parent | add a hint about subjectAltName. this isn't great, but i'm not sure how (diff) | |
| download | wireguard-openbsd-9da3575e51acd695cb33e5a319251ce88c518064.tar.xz wireguard-openbsd-9da3575e51acd695cb33e5a319251ce88c518064.zip | |
Revert grabbing the socket lock in kqueue filters.
It is unsafe to sleep while iterating the list of pending events in
kqueue_scan().
Reported by abieber@ and juanfra@
Diffstat (limited to 'sys/kern/uipc_socket.c')
| -rw-r--r-- | sys/kern/uipc_socket.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 7aa6aa595a4..8f686ee379a 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.192 2017/07/04 12:58:32 mpi Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.193 2017/07/08 09:19:02 mpi Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -1998,10 +1998,8 @@ int filt_sowrite(struct knote *kn, long hint) { struct socket *so = kn->kn_fp->f_data; - int s, rv; + int rv; - if (!(hint & NOTE_SUBMIT)) - s = solock(so); kn->kn_data = sbspace(so, &so->so_snd); if (so->so_state & SS_CANTSENDMORE) { kn->kn_flags |= EV_EOF; @@ -2017,8 +2015,6 @@ filt_sowrite(struct knote *kn, long hint) } else { rv = (kn->kn_data >= so->so_snd.sb_lowat); } - if (!(hint & NOTE_SUBMIT)) - sounlock(s); return (rv); } @@ -2027,13 +2023,8 @@ int filt_solisten(struct knote *kn, long hint) { struct socket *so = kn->kn_fp->f_data; - int s; - if (!(hint & NOTE_SUBMIT)) - s = solock(so); kn->kn_data = so->so_qlen; - if (!(hint & NOTE_SUBMIT)) - sounlock(s); return (kn->kn_data != 0); } |