Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Aug 2014 15:48:28 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r270575 - stable/10/sys/netpfil/pf
Message-ID:  <201408251548.s7PFmSUj069872@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Mon Aug 25 15:48:28 2014
New Revision: 270575
URL: http://svnweb.freebsd.org/changeset/base/270575

Log:
  Merge 270010 from head:
    Fix synproxy with IPv6. pf_test6() was missing a check for M_SKIP_FIREWALL.
  
    PR:           127920
    Submitted by: Kajetan Staszkiewicz <vegeta tuxpowered.net>
    Sponsored by: InnoGames GmbH

Modified:
  stable/10/sys/netpfil/pf/pf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netpfil/pf/pf.c
==============================================================================
--- stable/10/sys/netpfil/pf/pf.c	Mon Aug 25 15:40:37 2014	(r270574)
+++ stable/10/sys/netpfil/pf/pf.c	Mon Aug 25 15:48:28 2014	(r270575)
@@ -6069,6 +6069,9 @@ pf_test6(int dir, struct ifnet *ifp, str
 	if (kif->pfik_flags & PFI_IFLAG_SKIP)
 		return (PF_PASS);
 
+	if (m->m_flags & M_SKIP_FIREWALL)
+		return (PF_PASS);
+
 	PF_RULES_RLOCK();
 
 	/* We do IP header normalization and packet reassembly here */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408251548.s7PFmSUj069872>