Date: Sat, 14 Oct 2023 02:17:35 +0800 From: Zhenlei Huang <zlei@FreeBSD.org> To: Justin Hibbits <jhibbits@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: c81dd8e5fe72 - main - bpf: Add IfAPI analogue for bpf_peers_present() Message-ID: <7C71BC94-FEBF-49C9-90B3-FA326BB75EA8@FreeBSD.org> In-Reply-To: <C96636F5-D9B4-49EF-B526-A7A99455AFCB@FreeBSD.org> References: <202310131722.39DHM2b6077203@gitrepo.freebsd.org> <C96636F5-D9B4-49EF-B526-A7A99455AFCB@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] > On Oct 14, 2023, at 2:13 AM, Zhenlei Huang <zlei@FreeBSD.org> wrote: > > > >> On Oct 14, 2023, at 1:22 AM, Justin Hibbits <jhibbits@freebsd.org> wrote: >> >> The branch main has been updated by jhibbits: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=c81dd8e5fe72d0c7ec055c8621bb2da3a3627abf >> >> commit c81dd8e5fe72d0c7ec055c8621bb2da3a3627abf >> Author: Justin Hibbits <jhibbits@FreeBSD.org> >> AuthorDate: 2023-10-04 20:56:52 +0000 >> Commit: Justin Hibbits <jhibbits@FreeBSD.org> >> CommitDate: 2023-10-13 17:12:44 +0000 >> >> bpf: Add IfAPI analogue for bpf_peers_present() >> >> An interface's bpf could feasibly not exist, in which case >> bpf_peers_present() would panic from a NULL pointer dereference. Solve >> this by adding a new IfAPI that includes a NULL check. Since this API > > The initial version DOES have NULL check. But that is redundant and removed > from the committed version. See https://reviews.freebsd.org/D42082 <https://reviews.freebsd.org/D42082>; . > >> is used in only a handful of locations, it reduces the the NULL check >> scope over inserting the check into bpf_peers_present(). >> >> Sponsored by: Juniper Networks, Inc. >> MFC after: 1 week >> --- >> sys/dev/firewire/if_fwip.c | 4 ++-- >> sys/dev/hyperv/netvsc/if_hn.c | 4 ++-- >> sys/dev/my/if_my.c | 2 +- >> sys/dev/usb/usb_pf.c | 4 +--- >> sys/net/bpf.c | 14 ++++++++++++++ >> sys/net/bpf.h | 1 + >> 6 files changed, 21 insertions(+), 8 deletions(-) >> >> diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c >> index 5237c555d999..b698db6c9620 100644 >> --- a/sys/dev/firewire/if_fwip.c >> +++ b/sys/dev/firewire/if_fwip.c >> @@ -780,7 +780,7 @@ fwip_stream_input(struct fw_xferq *xferq) >> * Record the sender ID for possible BPF usage. >> */ >> src = ntohl(p[1]) >> 16; >> - if (bpf_peers_present(if_getbpf(ifp))) { >> + if (bpf_peers_present_if(ifp)) { >> mtag = m_tag_alloc(MTAG_FIREWIRE, >> MTAG_FIREWIRE_SENDER_EUID, >> 2*sizeof(uint32_t), M_NOWAIT); >> @@ -880,7 +880,7 @@ fwip_unicast_input(struct fw_xfer *xfer) >> goto done; >> } >> >> - if (bpf_peers_present(if_getbpf(ifp))) { >> + if (bpf_peers_present_if(ifp)) { >> /* >> * Record the sender ID for possible BPF usage. >> */ >> diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c >> index 7d8e1914163e..f6f885873a79 100644 >> --- a/sys/dev/hyperv/netvsc/if_hn.c >> +++ b/sys/dev/hyperv/netvsc/if_hn.c >> @@ -3262,7 +3262,7 @@ hn_txpkt(if_t ifp, struct hn_tx_ring *txr, struct hn_txdesc *txd) >> int error, send_failed = 0, has_bpf; >> >> again: >> - has_bpf = bpf_peers_present(if_getbpf(ifp)); >> + has_bpf = bpf_peers_present_if(ifp); >> if (has_bpf) { >> /* >> * Make sure that this txd and any aggregated txds are not >> @@ -5972,7 +5972,7 @@ hn_transmit(if_t ifp, struct mbuf *m) >> omcast = (m->m_flags & M_MCAST) != 0; >> >> if (sc->hn_xvf_flags & HN_XVFFLAG_ACCBPF) { >> - if (bpf_peers_present(if_getbpf(ifp))) { >> + if (bpf_peers_present_if(ifp)) { >> m_bpf = m_copypacket(m, M_NOWAIT); >> if (m_bpf == NULL) { >> /* >> diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c >> index 2bf4573d337b..631c38df9dca 100644 >> --- a/sys/dev/my/if_my.c >> +++ b/sys/dev/my/if_my.c >> @@ -1152,7 +1152,7 @@ my_rxeof(struct my_softc * sc) >> * broadcast packet, multicast packet, matches our ethernet >> * address or the interface is in promiscuous mode. >> */ >> - if (bpf_peers_present(if_getbpf(ifp))) { >> + if (bpf_peers_present_if(ifp)) { >> bpf_mtap_if(ifp, m); >> if (if_getflags(ifp) & IFF_PROMISC && >> (bcmp(eh->ether_dhost, if_getlladdr(sc->my_ifp), >> diff --git a/sys/dev/usb/usb_pf.c b/sys/dev/usb/usb_pf.c >> index 43e819684857..4da59419a7c6 100644 >> --- a/sys/dev/usb/usb_pf.c >> +++ b/sys/dev/usb/usb_pf.c >> @@ -408,9 +408,7 @@ usbpf_xfertap(struct usb_xfer *xfer, int type) >> bus = xfer->xroot->bus; >> >> /* sanity checks */ >> - if (bus->ifp == NULL || if_getbpf(bus->ifp) == NULL) >> - return; >> - if (!bpf_peers_present(if_getbpf(bus->ifp))) >> + if (bus->ifp == NULL || !bpf_peers_present_if(bus->ifp)) >> return; >> >> totlen = usbpf_xfer_precompute_size(xfer, type); >> diff --git a/sys/net/bpf.c b/sys/net/bpf.c >> index 8ca6e941e646..96420b709911 100644 >> --- a/sys/net/bpf.c >> +++ b/sys/net/bpf.c >> @@ -2879,6 +2879,14 @@ bpfdetach(struct ifnet *ifp) >> BPF_UNLOCK(); >> } >> >> +bool >> +bpf_peers_present_if(struct ifnet *ifp) >> +{ >> + struct bpf_if *bp = ifp->if_bpf; >> + >> + return (bpf_peers_present(bp) > 0); >> +} >> + >> /* >> * Get a list of available data link type of the interface. >> */ >> @@ -3162,6 +3170,12 @@ bpfdetach(struct ifnet *ifp) >> { >> } >> >> +bool >> +bpf_peers_present_if(struct ifnet *ifp) >> +{ >> + return (false); >> +} >> + >> u_int >> bpf_filter(const struct bpf_insn *pc, u_char *p, u_int wirelen, u_int buflen) >> { >> diff --git a/sys/net/bpf.h b/sys/net/bpf.h >> index 924dea5fc9f4..31968445aac1 100644 >> --- a/sys/net/bpf.h >> +++ b/sys/net/bpf.h >> @@ -428,6 +428,7 @@ void bpf_mtap2_if(struct ifnet *, void *, u_int, struct mbuf *); >> void bpfattach(struct ifnet *, u_int, u_int); >> void bpfattach2(struct ifnet *, u_int, u_int, struct bpf_if **); >> void bpfdetach(struct ifnet *); >> +bool bpf_peers_present_if(struct ifnet *); >> #ifdef VIMAGE >> int bpf_get_bp_params(struct bpf_if *, u_int *, u_int *); >> #endif Best regards, Zhenlei [-- Attachment #2 --] <html><head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On Oct 14, 2023, at 2:13 AM, Zhenlei Huang <<a href="mailto:zlei@FreeBSD.org" class="">zlei@FreeBSD.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><meta charset="UTF-8" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">On Oct 14, 2023, at 1:22 AM, Justin Hibbits <<a href="mailto:jhibbits@freebsd.org" class="">jhibbits@freebsd.org</a>> wrote:<br class=""><br class="">The branch main has been updated by jhibbits:<br class=""><br class="">URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=c81dd8e5fe72d0c7ec055c8621bb2da3a3627abf" class="">https://cgit.FreeBSD.org/src/commit/?id=c81dd8e5fe72d0c7ec055c8621bb2da3a3627abf</a><br class=""><br class="">commit c81dd8e5fe72d0c7ec055c8621bb2da3a3627abf<br class="">Author: Justin Hibbits <<a href="mailto:jhibbits@FreeBSD.org" class="">jhibbits@FreeBSD.org</a>><br class="">AuthorDate: 2023-10-04 20:56:52 +0000<br class="">Commit: Justin Hibbits <<a href="mailto:jhibbits@FreeBSD.org" class="">jhibbits@FreeBSD.org</a>><br class="">CommitDate: 2023-10-13 17:12:44 +0000<br class=""><br class=""> bpf: Add IfAPI analogue for bpf_peers_present()<br class=""><br class=""> An interface's bpf could feasibly not exist, in which case<br class=""> bpf_peers_present() would panic from a NULL pointer dereference. Solve<br class=""> this by adding a new IfAPI that includes a NULL check. Since this API<br class=""></blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">The initial version DOES have NULL check. But that is redundant and removed</span><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">from the committed version.</span><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""></div></blockquote><div><br class=""></div><div>See <a href="https://reviews.freebsd.org/D42082" class="">https://reviews.freebsd.org/D42082</a> .</div><br class=""><blockquote type="cite" class=""><div class=""><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""> is used in only a handful of locations, it reduces the the NULL check<br class=""> scope over inserting the check into bpf_peers_present().<br class=""><br class=""> Sponsored by: Juniper Networks, Inc.<br class=""> MFC after: 1 week<br class="">---<br class="">sys/dev/firewire/if_fwip.c | 4 ++--<br class="">sys/dev/hyperv/netvsc/if_hn.c | 4 ++--<br class="">sys/dev/my/if_my.c | 2 +-<br class="">sys/dev/usb/usb_pf.c | 4 +---<br class="">sys/net/bpf.c | 14 ++++++++++++++<br class="">sys/net/bpf.h | 1 +<br class="">6 files changed, 21 insertions(+), 8 deletions(-)<br class=""><br class="">diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c<br class="">index 5237c555d999..b698db6c9620 100644<br class="">--- a/sys/dev/firewire/if_fwip.c<br class="">+++ b/sys/dev/firewire/if_fwip.c<br class="">@@ -780,7 +780,7 @@ fwip_stream_input(struct fw_xferq *xferq)<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>* Record the sender ID for possible BPF usage.<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>*/<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>src = ntohl(p[1]) >> 16;<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>if (bpf_peers_present(if_getbpf(ifp))) {<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>if (bpf_peers_present_if(ifp)) {<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>mtag = m_tag_alloc(MTAG_FIREWIRE,<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span> MTAG_FIREWIRE_SENDER_EUID,<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span> 2*sizeof(uint32_t), M_NOWAIT);<br class="">@@ -880,7 +880,7 @@ fwip_unicast_input(struct fw_xfer *xfer)<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>goto done;<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>}<br class=""><br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>if (bpf_peers_present(if_getbpf(ifp))) {<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>if (bpf_peers_present_if(ifp)) {<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>/*<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>* Record the sender ID for possible BPF usage.<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>*/<br class="">diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c<br class="">index 7d8e1914163e..f6f885873a79 100644<br class="">--- a/sys/dev/hyperv/netvsc/if_hn.c<br class="">+++ b/sys/dev/hyperv/netvsc/if_hn.c<br class="">@@ -3262,7 +3262,7 @@ hn_txpkt(if_t ifp, struct hn_tx_ring *txr, struct hn_txdesc *txd)<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>int error, send_failed = 0, has_bpf;<br class=""><br class="">again:<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>has_bpf = bpf_peers_present(if_getbpf(ifp));<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>has_bpf = bpf_peers_present_if(ifp);<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>if (has_bpf) {<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>/*<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>* Make sure that this txd and any aggregated txds are not<br class="">@@ -5972,7 +5972,7 @@ hn_transmit(if_t ifp, struct mbuf *m)<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>omcast = (m->m_flags & M_MCAST) != 0;<br class=""><br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>if (sc->hn_xvf_flags & HN_XVFFLAG_ACCBPF) {<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>if (bpf_peers_present(if_getbpf(ifp))) {<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>if (bpf_peers_present_if(ifp)) {<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>m_bpf = m_copypacket(m, M_NOWAIT);<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>if (m_bpf == NULL) {<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>/*<br class="">diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c<br class="">index 2bf4573d337b..631c38df9dca 100644<br class="">--- a/sys/dev/my/if_my.c<br class="">+++ b/sys/dev/my/if_my.c<br class="">@@ -1152,7 +1152,7 @@ my_rxeof(struct my_softc * sc)<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>* broadcast packet, multicast packet, matches our ethernet<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>* address or the interface is in promiscuous mode.<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>*/<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>if (bpf_peers_present(if_getbpf(ifp))) {<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>if (bpf_peers_present_if(ifp)) {<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>bpf_mtap_if(ifp, m);<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>if (if_getflags(ifp) & IFF_PROMISC &&<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span> (bcmp(eh->ether_dhost, if_getlladdr(sc->my_ifp),<br class="">diff --git a/sys/dev/usb/usb_pf.c b/sys/dev/usb/usb_pf.c<br class="">index 43e819684857..4da59419a7c6 100644<br class="">--- a/sys/dev/usb/usb_pf.c<br class="">+++ b/sys/dev/usb/usb_pf.c<br class="">@@ -408,9 +408,7 @@ usbpf_xfertap(struct usb_xfer *xfer, int type)<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>bus = xfer->xroot->bus;<br class=""><br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>/* sanity checks */<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>if (bus->ifp == NULL || if_getbpf(bus->ifp) == NULL)<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>return;<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>if (!bpf_peers_present(if_getbpf(bus->ifp)))<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>if (bus->ifp == NULL || !bpf_peers_present_if(bus->ifp))<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>return;<br class=""><br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>totlen = usbpf_xfer_precompute_size(xfer, type);<br class="">diff --git a/sys/net/bpf.c b/sys/net/bpf.c<br class="">index 8ca6e941e646..96420b709911 100644<br class="">--- a/sys/net/bpf.c<br class="">+++ b/sys/net/bpf.c<br class="">@@ -2879,6 +2879,14 @@ bpfdetach(struct ifnet *ifp)<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>BPF_UNLOCK();<br class="">}<br class=""><br class="">+bool<br class="">+bpf_peers_present_if(struct ifnet *ifp)<br class="">+{<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>struct bpf_if *bp = ifp->if_bpf;<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>return (bpf_peers_present(bp) > 0);<br class="">+}<br class="">+<br class="">/*<br class="">* Get a list of available data link type of the interface.<br class="">*/<br class="">@@ -3162,6 +3170,12 @@ bpfdetach(struct ifnet *ifp)<br class="">{<br class="">}<br class=""><br class="">+bool<br class="">+bpf_peers_present_if(struct ifnet *ifp)<br class="">+{<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>return (false);<br class="">+}<br class="">+<br class="">u_int<br class="">bpf_filter(const struct bpf_insn *pc, u_char *p, u_int wirelen, u_int buflen)<br class="">{<br class="">diff --git a/sys/net/bpf.h b/sys/net/bpf.h<br class="">index 924dea5fc9f4..31968445aac1 100644<br class="">--- a/sys/net/bpf.h<br class="">+++ b/sys/net/bpf.h<br class="">@@ -428,6 +428,7 @@ void<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>bpf_mtap2_if(struct ifnet *, void *, u_int, struct mbuf *);<br class="">void<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>bpfattach(struct ifnet *, u_int, u_int);<br class="">void<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>bpfattach2(struct ifnet *, u_int, u_int, struct bpf_if **);<br class="">void<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>bpfdetach(struct ifnet *);<br class="">+bool<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>bpf_peers_present_if(struct ifnet *);<br class="">#ifdef VIMAGE<br class="">int<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span>bpf_get_bp_params(struct bpf_if *, u_int *, u_int *);<br class="">#endif</blockquote></div></blockquote></div><br class=""><div class=""> <div>Best regards,</div><div>Zhenlei</div> </div> <br class=""></body></html>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7C71BC94-FEBF-49C9-90B3-FA326BB75EA8>