From owner-svn-src-stable-10@freebsd.org  Tue Aug  1 13:15:31 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 A0482DAD3CD;
 Tue,  1 Aug 2017 13:15:31 +0000 (UTC)
 (envelope-from philip@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 6EBE277315;
 Tue,  1 Aug 2017 13:15:31 +0000 (UTC)
 (envelope-from philip@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v71DFUac039448;
 Tue, 1 Aug 2017 13:15:30 GMT (envelope-from philip@FreeBSD.org)
Received: (from philip@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v71DFUQf039447;
 Tue, 1 Aug 2017 13:15:30 GMT (envelope-from philip@FreeBSD.org)
Message-Id: <201708011315.v71DFUQf039447@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: philip set sender to
 philip@FreeBSD.org using -f
From: Philip Paeps <philip@FreeBSD.org>
Date: Tue, 1 Aug 2017 13:15:30 +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: r321873 - stable/10/sys/netpfil/ipfw
X-SVN-Group: stable-10
X-SVN-Commit-Author: philip
X-SVN-Commit-Paths: stable/10/sys/netpfil/ipfw
X-SVN-Commit-Revision: 321873
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Aug 2017 13:15:31 -0000

Author: philip
Date: Tue Aug  1 13:15:30 2017
New Revision: 321873
URL: https://svnweb.freebsd.org/changeset/base/321873

Log:
  MFC r320941: Fix GRE over IPv6 tunnels with IPFW
  
  Previously, GRE packets in IPv6 tunnels would be dropped by IPFW (unless
  net.inet6.ip6.fw.deny_unknown_exthdrs was unset).
  
  PR:           220640
  Submitted by: Kun Xie <kxie@xiplink.com>

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

Modified: stable/10/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- stable/10/sys/netpfil/ipfw/ip_fw2.c	Tue Aug  1 13:07:54 2017	(r321872)
+++ stable/10/sys/netpfil/ipfw/ip_fw2.c	Tue Aug  1 13:15:30 2017	(r321873)
@@ -87,6 +87,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/ip6_var.h>
 #endif
 
+#include <net/if_gre.h> /* for struct grehdr */
+
 #include <netpfil/ipfw/ip_fw_private.h>
 
 #include <machine/in_cksum.h>	/* XXX for in_cksum */
@@ -1141,6 +1143,11 @@ do {								\
 			case IPPROTO_PIM:
 				/* XXX PIM header check? */
 				PULLUP_TO(hlen, ulp, struct pim);
+				break;
+
+			case IPPROTO_GRE:	/* RFC 1701 */
+				/* XXX GRE header check? */
+				PULLUP_TO(hlen, ulp, struct grehdr);
 				break;
 
 			case IPPROTO_CARP: