svn commit: r296932 - head/sys/netpfil/pf

Kristof Provost kp at FreeBSD.org
Wed Mar 16 06:42:16 UTC 2016


Author: kp
Date: Wed Mar 16 06:42:15 2016
New Revision: 296932
URL: https://svnweb.freebsd.org/changeset/base/296932

Log:
  pf: Improve forwarding detection
  
  When we guess the nature of the outbound packet (output vs. forwarding) we need
  to take bridges into account. When bridging the input interface does not match
  the output interface, but we're not forwarding. Similarly, it's possible for the
  interface to actually be the bridge interface itself (and not a member interface).
  
  PR:		202351
  MFC after:	2 weeks

Modified:
  head/sys/netpfil/pf/pf.c

Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c	Wed Mar 16 06:27:57 2016	(r296931)
+++ head/sys/netpfil/pf/pf.c	Wed Mar 16 06:42:15 2016	(r296932)
@@ -6192,11 +6192,13 @@ pf_test6(int dir, struct ifnet *ifp, str
 	 * We do need to be careful about bridges. If the
 	 * net.link.bridge.pfil_bridge sysctl is set we can be filtering on a
 	 * bridge, so if the input interface is a bridge member and the output
-	 * interface is its bridge we're not actually forwarding but bridging.
+	 * interface is its bridge or a member of the same bridge we're not
+	 * actually forwarding but bridging.
 	 */
-	if (dir == PF_OUT && m->m_pkthdr.rcvif && ifp != m->m_pkthdr.rcvif
-	    && (m->m_pkthdr.rcvif->if_bridge == NULL
-	        || m->m_pkthdr.rcvif->if_bridge != ifp->if_softc))
+	if (dir == PF_OUT && m->m_pkthdr.rcvif && ifp != m->m_pkthdr.rcvif &&
+	    (m->m_pkthdr.rcvif->if_bridge == NULL ||
+	    (m->m_pkthdr.rcvif->if_bridge != ifp->if_softc &&
+	    m->m_pkthdr.rcvif->if_bridge != ifp->if_bridge)))
 		fwdir = PF_FWD;
 
 	if (!V_pf_status.running)


More information about the svn-src-head mailing list