From owner-svn-src-head@freebsd.org  Sun Mar 19 03:06:11 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 321E9D13801;
 Sun, 19 Mar 2017 03:06:11 +0000 (UTC) (envelope-from kp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 EDDA0A64;
 Sun, 19 Mar 2017 03:06:10 +0000 (UTC) (envelope-from kp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2J36AC0086100;
 Sun, 19 Mar 2017 03:06:10 GMT (envelope-from kp@FreeBSD.org)
Received: (from kp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2J36AZG086099;
 Sun, 19 Mar 2017 03:06:10 GMT (envelope-from kp@FreeBSD.org)
Message-Id: <201703190306.v2J36AZG086099@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org
 using -f
From: Kristof Provost <kp@FreeBSD.org>
Date: Sun, 19 Mar 2017 03:06:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315529 - head/sys/netpfil/pf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Mar 2017 03:06:11 -0000

Author: kp
Date: Sun Mar 19 03:06:09 2017
New Revision: 315529
URL: https://svnweb.freebsd.org/changeset/base/315529

Log:
  pf: Fix rule evaluation after inet6 route-to
  
  In pf_route6() we re-run the ruleset with PF_FWD if the packet goes out
  of a different interface. pf_test6() needs to know that the packet was
  forwarded (in case it needs to refragment so it knows whether to call
  ip6_output() or ip6_forward()).
  
  This lead pf_test6() to try to evaluate rules against the PF_FWD
  direction, which isn't supported, so it needs to treat PF_FWD as PF_OUT.
  Once fwdir is set correctly the correct output/forward function will be
  called.
  
  PR:		217883
  Submitted by:	Kajetan Staszkiewicz
  MFC after:	1 week
  Sponsored by:	InnoGames GmbH

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

Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c	Sun Mar 19 01:24:18 2017	(r315528)
+++ head/sys/netpfil/pf/pf.c	Sun Mar 19 03:06:09 2017	(r315529)
@@ -6245,6 +6245,9 @@ pf_test6(int dir, struct ifnet *ifp, str
 	    m->m_pkthdr.rcvif->if_bridge != ifp->if_bridge)))
 		fwdir = PF_FWD;
 
+	if (dir == PF_FWD)
+		dir = PF_OUT;
+
 	if (!V_pf_status.running)
 		return (PF_PASS);