From owner-svn-src-head@FreeBSD.ORG  Tue Jul  1 07:54:13 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2B920CBD;
 Tue,  1 Jul 2014 07:54:13 +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 19E5020F6;
 Tue,  1 Jul 2014 07:54:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s617sCOO023193;
 Tue, 1 Jul 2014 07:54:12 GMT (envelope-from zec@svn.freebsd.org)
Received: (from zec@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s617sClV023192;
 Tue, 1 Jul 2014 07:54:12 GMT (envelope-from zec@svn.freebsd.org)
Message-Id: <201407010754.s617sClV023192@svn.freebsd.org>
From: Marko Zec <zec@FreeBSD.org>
Date: Tue, 1 Jul 2014 07:54:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268081 - head/sys/netgraph
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.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jul 2014 07:54:13 -0000

Author: zec
Date: Tue Jul  1 07:54:12 2014
New Revision: 268081
URL: http://svnweb.freebsd.org/changeset/base/268081

Log:
  Remove any stale mbuf tags from packets being injected into a netgraph
  graph.  In particular, this solves some issues with (probably leaked)
  IPSec-related tags being looped back through netgraph to the inbound
  path which then misinterpreted the stale tags.
  
  MFC after:	7 days

Modified:
  head/sys/netgraph/ng_eiface.c

Modified: head/sys/netgraph/ng_eiface.c
==============================================================================
--- head/sys/netgraph/ng_eiface.c	Tue Jul  1 07:30:29 2014	(r268080)
+++ head/sys/netgraph/ng_eiface.c	Tue Jul  1 07:54:12 2014	(r268081)
@@ -236,6 +236,9 @@ ng_eiface_start2(node_p node, hook_p hoo
 		if (m == NULL)
 			break;
 
+		/* Peel the mbuf off any stale tags */
+		m_tag_delete_chain(m, NULL);
+
 		/*
 		 * Berkeley packet filter.
 		 * Pass packet to bpf if there is a listener.