Date: Sat, 03 Jun 2006 14:33:51 +1000 From: Benno Rice <benno@FreeBSD.org> To: "Christian S.J. Peron" <csjp@FreeBSD.org> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/dev/ath if_ath.c src/sys/dev/ipw if_ipw.c src/sys/dev/iwi if_iwi.c src/sys/dev/ral rt2560.c rt2661.c src/sys/dev/usb if_ural.c src/sys/dev/wi if_wi.c src/sys/net bpf.c bpf.h bpfdesc.h if_disc.c if_gif.c if_gre.c if_loop.c if_sl.c ... Message-ID: <4481112F.5080807@FreeBSD.org> In-Reply-To: <200606021959.k52JxXlr022148@repoman.freebsd.org> References: <200606021959.k52JxXlr022148@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------030502080208070809030700
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Christian S.J. Peron wrote:
[snip]
> Log:
> Fix the following bpf(4) race condition which can result in a panic:
[snip]
This change causes panics in kernels that don't have device bpf present.
The attached patch fixes this.
--
Benno Rice
benno@FreeBSD.org
--------------030502080208070809030700
Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="bpf.h.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="bpf.h.diff"
Index: bpf.h
===================================================================
RCS file: /home/ncvs/src/sys/net/bpf.h,v
retrieving revision 1.41
diff -u -r1.41 bpf.h
--- bpf.h 2 Jun 2006 19:59:32 -0000 1.41
+++ bpf.h 3 Jun 2006 04:31:10 -0000
@@ -630,7 +630,11 @@
bpf_peers_present(struct bpf_if *bpf)
{
+#if defined(DEV_BPF) || defined(NETGRAPH_BPF)
return !LIST_EMPTY(&bpf->bif_dlist);
+#else
+ return (0);
+#endif
}
#define BPF_TAP(_ifp,_pkt,_pktlen) do { \
--------------030502080208070809030700--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4481112F.5080807>