From owner-p4-projects@FreeBSD.ORG  Sun Nov  9 14:33:57 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B04E3106567F; Sun,  9 Nov 2008 14:33:56 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 746A71065672
	for <perforce@FreeBSD.org>; Sun,  9 Nov 2008 14:33:56 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5FA7D8FC1B
	for <perforce@FreeBSD.org>; Sun,  9 Nov 2008 14:33:56 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA9EXuEq082683
	for <perforce@FreeBSD.org>; Sun, 9 Nov 2008 14:33:56 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA9EXuhg082681
	for perforce@freebsd.org; Sun, 9 Nov 2008 14:33:56 GMT
	(envelope-from gk@FreeBSD.org)
Date: Sun, 9 Nov 2008 14:33:56 GMT
Message-Id: <200811091433.mA9EXuhg082681@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou <gk@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 152690 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Nov 2008 14:33:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=152690

Change 152690 by gk@gk_h1 on 2008/11/09 14:33:22

	mbuf can be consumed by pfil

Affected files ...

.. //depot/projects/soc2008/gk_l2filter/sys-net/if_bridge.c#11 edit
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_ethersubr.c#6 edit

Differences ...

==== //depot/projects/soc2008/gk_l2filter/sys-net/if_bridge.c#11 (text+ko) ====

@@ -2974,7 +2974,8 @@
 
 	if (PFIL_HOOKED(&ether_pfil_hook) && dir == PFIL_OUT && bifp != NULL &&
 			(bifp->if_flags & IFF_L2FILTER)) {
-		if (pfil_run_hooks(&ether_pfil_hook, mp, bifp, PFIL_OUT, NULL) != 0)
+		if (pfil_run_hooks(&ether_pfil_hook, mp, bifp, PFIL_OUT, NULL) != 0 ||
+				*mp == NULL)
 			return EACCES;
 	}
 

==== //depot/projects/soc2008/gk_l2filter/sys-net/if_ethersubr.c#6 (text+ko) ====

@@ -612,7 +612,8 @@
 	 */
 	if (PFIL_HOOKED(&ether_pfil_hook) && (ifp->if_flags & IFF_L2FILTER) &&
 			!(m->m_flags & M_PROMISC)) {
-		if (pfil_run_hooks(&ether_pfil_hook, &m, ifp, PFIL_IN, NULL) != 0)
+		if (pfil_run_hooks(&ether_pfil_hook, &m, ifp, PFIL_IN, NULL) != 0 ||
+				m == NULL)
 			return;
 	}
 	eh = mtod(m, struct ether_header *);