diff options
| author |   dlg <dlg@openbsd.org> | 2015-08-16 11:28:31 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2015-08-16 11:28:31 +0000 |
| commit | 37a1006546d42fb1e383a4bb4381e1065cc9fdf6 (patch) | |
| tree | 12edb833fd0938b4ef6cbd29f3f48401ce1b3672 | |
| parent | Come out of copy mode when history is cleared. (diff) | |
| download | wireguard-openbsd-37a1006546d42fb1e383a4bb4381e1065cc9fdf6.tar.xz wireguard-openbsd-37a1006546d42fb1e383a4bb4381e1065cc9fdf6.zip | |
avoid a toctou problem in if_input in the bpf handling.
load ifp->if_bpf into a local variable, test that, and pass it to bpf.
this is instead of instead of assuming ifp->if_bpf wont change between
checking it and passing it to bpf.
| -rw-r--r-- | sys/net/if.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index a195707195c..4a7c3dd07af 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.357 2015/08/13 07:19:58 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.358 2015/08/16 11:28:31 dlg Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -471,6 +471,9 @@ if_input(struct ifnet *ifp, struct mbuf_list *ml) { struct mbuf *m; size_t ibytes = 0; +#if NBPFILTER > 0 + caddr_t if_bpf; +#endif MBUF_LIST_FOREACH(ml, m) { m->m_pkthdr.ph_ifidx = ifp->if_index; @@ -482,10 +485,11 @@ if_input(struct ifnet *ifp, struct mbuf_list *ml) ifp->if_ibytes += ibytes; #if NBPFILTER > 0 - if (ifp->if_bpf) { + if_bpf = ifp->if_bpf; + if (if_bpf) { KERNEL_LOCK(); MBUF_LIST_FOREACH(ml, m) - bpf_mtap_ether(ifp->if_bpf, m, BPF_DIRECTION_IN); + bpf_mtap_ether(if_bpf, m, BPF_DIRECTION_IN); KERNEL_UNLOCK(); } #endif |