From owner-p4-projects  Wed Sep 18 15:16:15 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 56C4437B404; Wed, 18 Sep 2002 15:16:13 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0327237B401
	for <perforce@freebsd.org>; Wed, 18 Sep 2002 15:16:13 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B047C43E3B
	for <perforce@freebsd.org>; Wed, 18 Sep 2002 15:16:12 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8IMGCCo089492
	for <perforce@freebsd.org>; Wed, 18 Sep 2002 15:16:12 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8IMGC2n089489
	for perforce@freebsd.org; Wed, 18 Sep 2002 15:16:12 -0700 (PDT)
Date: Wed, 18 Sep 2002 15:16:12 -0700 (PDT)
Message-Id: <200209182216.g8IMGC2n089489@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 17673 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17673

Change 17673 by rwatson@rwatson_paprika on 2002/09/18 15:15:59

	Add a missing MAC check for the BPF code; not clear if this
	was lost during an integ, or a victim of moving source code
	in -current.
	
	Pointed out by:	phk

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/net/bpf.c#16 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/net/bpf.c#16 (text+ko) ====

@@ -1137,7 +1137,11 @@
 		++d->bd_rcount;
 		slen = bpf_filter(d->bd_filter, (u_char *)m, pktlen, 0);
 		if (slen != 0)
-			catchpacket(d, (u_char *)m, pktlen, slen, bpf_mcopy);
+#ifdef MAC
+			if (mac_check_bpfdesc_receive(d, ifp) == 0)
+#endif
+				catchpacket(d, (u_char *)m, pktlen, slen,
+				    bpf_mcopy);
 		BPFD_UNLOCK(d);
 	}
 	BPFIF_UNLOCK(bp);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message