From owner-svn-src-stable@FreeBSD.ORG  Sat Jul  4 06:00:57 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CA65C106566C;
	Sat,  4 Jul 2009 06:00:57 +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 B795A8FC17;
	Sat,  4 Jul 2009 06:00:57 +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 n6460vCg000181;
	Sat, 4 Jul 2009 06:00:57 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6460vaU000179;
	Sat, 4 Jul 2009 06:00:57 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200907040600.n6460vaU000179@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 4 Jul 2009 06:00:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195336 - in stable/7/sys: . contrib/pf netgraph
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jul 2009 06:00:58 -0000

Author: mav
Date: Sat Jul  4 06:00:57 2009
New Revision: 195336
URL: http://svn.freebsd.org/changeset/base/195336

Log:
  MFC rev.195335:
  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

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/netgraph/ng_iface.c

Modified: stable/7/sys/netgraph/ng_iface.c
==============================================================================
--- stable/7/sys/netgraph/ng_iface.c	Sat Jul  4 05:07:52 2009	(r195335)
+++ stable/7/sys/netgraph/ng_iface.c	Sat Jul  4 06:00:57 2009	(r195336)
@@ -365,7 +365,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);