From owner-cvs-all@FreeBSD.ORG  Fri Apr  8 12:36:24 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 32BCA16A4CE; Fri,  8 Apr 2005 12:36:24 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 18B3A43D31; Fri,  8 Apr 2005 12:36:24 +0000 (GMT)
	(envelope-from glebius@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j38CaNT8040178;
	Fri, 8 Apr 2005 12:36:23 GMT
	(envelope-from glebius@repoman.freebsd.org)
Received: (from glebius@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j38CaNZO040177;
	Fri, 8 Apr 2005 12:36:23 GMT
	(envelope-from glebius)
Message-Id: <200504081236.j38CaNZO040177@repoman.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 8 Apr 2005 12:36:23 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Subject: cvs commit: src/sys/netinet ip_fw_pfil.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Apr 2005 12:36:24 -0000

glebius     2005-04-08 12:36:23 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/netinet          ip_fw_pfil.c 
  Log:
  MFC 1.18:
     When a packet has been reinjected into ipfw(4) after dummynet(4) processing
     we have a non-NULL args.rule. If the same packet later is subject to "tee"
     rule, its original is sent again into ipfw_chk() and it reenters at the same
     rule. This leads to infinite loop and frozen router.
  
     Assign args.rule to NULL, any time we are going to send packet back to
     ipfw_chk() after a tee rule. This is a temporary workaround, which we
     will leave for RELENG_5. In HEAD we are going to make divert(4) save
     next rule the same way as dummynet(4) does.
  
     PR:             kern/79546
     Submitted by:   Oleg Bulyzhin
     Reviewed by:    maxim, andre
  
  Approved by:    re (kensmith)
  
  Revision  Changes    Path
  1.1.2.9   +6 -2      src/sys/netinet/ip_fw_pfil.c