From owner-svn-src-stable@FreeBSD.ORG  Mon Aug 25 15:48:28 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 93EA6A8F;
 Mon, 25 Aug 2014 15:48:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7EC8C39A0;
 Mon, 25 Aug 2014 15:48:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PFmSm2069873;
 Mon, 25 Aug 2014 15:48:28 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PFmSUj069872;
 Mon, 25 Aug 2014 15:48:28 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201408251548.s7PFmSUj069872@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 25 Aug 2014 15:48:28 +0000 (UTC)
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
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Aug 2014 15:48:28 -0000

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 */