From owner-cvs-src@FreeBSD.ORG  Sat Jun  3 06:48:17 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 20DE016A46A
	for <cvs-src@FreeBSD.org>; Sat,  3 Jun 2006 06:48:17 +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 A212143D46
	for <cvs-src@FreeBSD.org>; Sat,  3 Jun 2006 06:48:15 +0000 (GMT)
	(envelope-from csjp@FreeBSD.org)
Received: (qmail 22419 invoked by uid 86); 3 Jun 2006 07:14:17 -0000
Received: from unknown (HELO ?127.0.0.1?) (204.112.0.37)
	by ems01.seccuris.com with SMTP; 3 Jun 2006 07:14:17 -0000
Message-ID: <448130AD.4080705@FreeBSD.org>
Date: Sat, 03 Jun 2006 01:48:13 -0500
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
User-Agent: Thunderbird 1.5.0.4 (Macintosh/20060530)
MIME-Version: 1.0
To: Benno Rice <benno@FreeBSD.org>
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-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 06:48:17 -0000

Committed, thanks.

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