From owner-svn-src-head@FreeBSD.ORG  Wed Jul  1 08:08:56 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B5F331065672;
	Wed,  1 Jul 2009 08:08:56 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6E75C8FC16;
	Wed,  1 Jul 2009 08:08:56 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6188ufo005874;
	Wed, 1 Jul 2009 08:08:56 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6188u1q005872;
	Wed, 1 Jul 2009 08:08:56 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200907010808.n6188u1q005872@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 1 Jul 2009 08:08:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195231 - head/sys/netgraph
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 01 Jul 2009 08:08:57 -0000

Author: mav
Date: Wed Jul  1 08:08:56 2009
New Revision: 195231
URL: http://svn.freebsd.org/changeset/base/195231

Log:
  Fix infinite loop in ng_iface, that happens when packet passes out via
  two different ng interfaces sequentially due to tunnelling.
  
  PR:		kern/134557
  Submitted by:	Mikolaj Golub
  Approved by:	re (kensmith)
  MFC after:	3 days

Modified:
  head/sys/netgraph/ng_iface.c

Modified: head/sys/netgraph/ng_iface.c
==============================================================================
--- head/sys/netgraph/ng_iface.c	Wed Jul  1 07:37:21 2009	(r195230)
+++ head/sys/netgraph/ng_iface.c	Wed Jul  1 08:08:56 2009	(r195231)
@@ -382,7 +382,8 @@ ng_iface_output(struct ifnet *ifp, struc
 	}
 
 	/* Protect from deadly infinite recursion. */
-	while ((mtag = m_tag_locate(m, MTAG_NGIF, MTAG_NGIF_CALLED, NULL))) {
+	mtag = NULL;
+	while ((mtag = m_tag_locate(m, MTAG_NGIF, MTAG_NGIF_CALLED, mtag))) {
 		if (*(struct ifnet **)(mtag + 1) == ifp) {
 			log(LOG_NOTICE, "Loop detected on %s\n", ifp->if_xname);
 			m_freem(m);