From owner-svn-src-stable@freebsd.org  Sun Mar 26 18:11:41 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 59FE6D1ED32;
 Sun, 26 Mar 2017 18:11:41 +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 293A0115D;
 Sun, 26 Mar 2017 18:11:41 +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 v2QIBeHE008440;
 Sun, 26 Mar 2017 18:11:40 GMT (envelope-from kp@FreeBSD.org)
Received: (from kp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2QIBeDA008439;
 Sun, 26 Mar 2017 18:11:40 GMT (envelope-from kp@FreeBSD.org)
Message-Id: <201703261811.v2QIBeDA008439@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, 26 Mar 2017 18:11:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r315999 - stable/11/sys/netpfil/pf
X-SVN-Group: stable-11
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.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Mar 2017 18:11:41 -0000

Author: kp
Date: Sun Mar 26 18:11:40 2017
New Revision: 315999
URL: https://svnweb.freebsd.org/changeset/base/315999

Log:
  MFC 315529
  
  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
  Sponsored by:   InnoGames GmbH

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

Modified: stable/11/sys/netpfil/pf/pf.c
==============================================================================
--- stable/11/sys/netpfil/pf/pf.c	Sun Mar 26 18:08:55 2017	(r315998)
+++ stable/11/sys/netpfil/pf/pf.c	Sun Mar 26 18:11:40 2017	(r315999)
@@ -6259,6 +6259,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);