From owner-svn-src-all@FreeBSD.ORG  Sat May  9 19:36:31 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 518C5727;
 Sat,  9 May 2015 19:36:31 +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 3FB201A8B;
 Sat,  9 May 2015 19:36:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t49JaVeb079659;
 Sat, 9 May 2015 19:36:31 GMT (envelope-from gnn@FreeBSD.org)
Received: (from gnn@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t49JaVNa079658;
 Sat, 9 May 2015 19:36:31 GMT (envelope-from gnn@FreeBSD.org)
Message-Id: <201505091936.t49JaVNa079658@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gnn set sender to gnn@FreeBSD.org
 using -f
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Sat, 9 May 2015 19:36:31 +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: r282688 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 May 2015 19:36:31 -0000

Author: gnn
Date: Sat May  9 19:36:30 2015
New Revision: 282688
URL: https://svnweb.freebsd.org/changeset/base/282688

Log:
  MFC: 281529
  
  I can find no reason to allow packets with both SYN and FIN bits
  set past this point in the code. The packet should be dropped and
  not massaged as it is here.
  
  Differential Revision:  https://reviews.freebsd.org/D2266
  Submitted by: eri
  Sponsored by: Rubicon Communications (Netgate)

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

Modified: stable/10/sys/netpfil/pf/pf_norm.c
==============================================================================
--- stable/10/sys/netpfil/pf/pf_norm.c	Sat May  9 19:29:55 2015	(r282687)
+++ stable/10/sys/netpfil/pf/pf_norm.c	Sat May  9 19:36:30 2015	(r282688)
@@ -1348,7 +1348,7 @@ pf_normalize_tcp(int dir, struct pfi_kif
 			goto tcp_drop;
 
 		if (flags & TH_FIN)
-			flags &= ~TH_FIN;
+			goto tcp_drop;
 	} else {
 		/* Illegal packet */
 		if (!(flags & (TH_ACK|TH_RST)))