From owner-cvs-all@FreeBSD.ORG Sun Jun 4 18:38:34 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4622916A4E9 for ; Sun, 4 Jun 2006 18:38:34 +0000 (UTC) (envelope-from csjp@FreeBSD.org) Received: from ems01.seccuris.com (ems01.seccuris.com [204.112.0.35]) by mx1.FreeBSD.org (Postfix) with SMTP id CCE6543D49 for ; Sun, 4 Jun 2006 18:38:32 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: (qmail 14790 invoked by uid 86); 4 Jun 2006 19:05:16 -0000 Received: from unknown (HELO ?127.0.0.1?) (204.112.0.37) by ems01.seccuris.com with SMTP; 4 Jun 2006 19:05:16 -0000 Message-ID: <448328A7.3060604@FreeBSD.org> Date: Sun, 04 Jun 2006 13:38:31 -0500 From: "Christian S.J. Peron" User-Agent: Thunderbird 1.5.0.4 (Macintosh/20060530) MIME-Version: 1.0 To: Benno Rice References: <200606021959.k52JxXlr022148@repoman.freebsd.org> <4481112F.5080807@FreeBSD.org> In-Reply-To: <4481112F.5080807@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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 ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2006 18:38:34 -0000 Can you try this patch: http://people.freebsd.org/~csjp/no.bpf.1149425152.diff and tell me how it works for you? Benno Rice wrote: > 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. > > ------------------------------------------------------------------------ > > 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 { \ > -- Christian S.J. Peron csjp@FreeBSD.ORG FreeBSD Committer FreeBSD Security Team