diff options
| author |   mpi <mpi@openbsd.org> | 2016-11-21 09:15:40 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2016-11-21 09:15:40 +0000 |
| commit | fbbfa44eaa99f5c5fa242a796db8e6746c5a77cb (patch) | |
| tree | c7d85e30b506ac5766a6e0f8837a25353f860db3 | |
| parent | Rename bpf_reset_d() to match bpf_{attach,reset}d(). (diff) | |
| download | wireguard-openbsd-fbbfa44eaa99f5c5fa242a796db8e6746c5a77cb.tar.xz wireguard-openbsd-fbbfa44eaa99f5c5fa242a796db8e6746c5a77cb.zip | |
Make sure bpf_wakeup() is called at most once when matching conditions
are fulfilled in bpf_catchpacket().
| -rw-r--r-- | sys/net/bpf.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c index c5957e31032..10ecea17088 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf.c,v 1.153 2016/11/21 09:12:18 mpi Exp $ */ +/* $OpenBSD: bpf.c,v 1.154 2016/11/21 09:15:40 mpi Exp $ */ /* $NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $ */ /* @@ -1364,7 +1364,7 @@ bpf_catchpacket(struct bpf_d *d, u_char *pkt, size_t pktlen, size_t snaplen, { struct bpf_hdr *hp; int totlen, curlen; - int hdrlen; + int hdrlen, do_wakeup = 0; if (d->bd_bif == NULL) return; @@ -1400,7 +1400,7 @@ bpf_catchpacket(struct bpf_d *d, u_char *pkt, size_t pktlen, size_t snaplen, return; } ROTATE_BUFFERS(d); - bpf_wakeup(d); + do_wakeup = 1; curlen = 0; } @@ -1423,7 +1423,7 @@ bpf_catchpacket(struct bpf_d *d, u_char *pkt, size_t pktlen, size_t snaplen, * Immediate mode is set. A packet arrived so any * reads should be woken up. */ - bpf_wakeup(d); + do_wakeup = 1; } if (d->bd_rdStart && (d->bd_rtout + d->bd_rdStart < ticks)) { @@ -1432,12 +1432,15 @@ bpf_catchpacket(struct bpf_d *d, u_char *pkt, size_t pktlen, size_t snaplen, * may have timeouts set. We got here by getting * a packet, so wake up the reader. */ - if (d->bd_fbuf) { + if (d->bd_fbuf != NULL) { d->bd_rdStart = 0; ROTATE_BUFFERS(d); - bpf_wakeup(d); + do_wakeup = 1; } } + + if (do_wakeup) + bpf_wakeup(d); } /* |