PERFORCE change 152690 for review

[Gleb Kurtsou]

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

Change 152690 by gk at 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 *);