From owner-cvs-src@FreeBSD.ORG  Sat Aug  6 01:52:36 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0CF5416A41F;
	Sat,  6 Aug 2005 01:52:36 +0000 (GMT)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BEB8843D45;
	Sat,  6 Aug 2005 01:52:35 +0000 (GMT)
	(envelope-from mlaier@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 j761qZJR039178;
	Sat, 6 Aug 2005 01:52:35 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j761qZbn039177;
	Sat, 6 Aug 2005 01:52:35 GMT (envelope-from mlaier)
Message-Id: <200508060152.j761qZbn039177@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Sat, 6 Aug 2005 01:52:35 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/contrib/pf/net pf.c pfvar.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Aug 2005 01:52:36 -0000

mlaier      2005-08-06 01:52:35 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/contrib/pf/net   pf.c pfvar.h 
  Log:
  MFC: pf.c, 1.35 pfvar.h, 1.12
  
    Prevent a race condition.  As pf_send_tcp() - called for expired synproxy
    states - has to drop the lock when calling back to ip_output(), the state
    purge timeout might run and gc the state. This results in a rb-tree
    inconsistency.  With this change we flag expiring states while holding the
    lock and back off if the flag is already set.
  
    Reported by:  glebius
  
  Approved by:    re (kensmith)
  
  Revision  Changes    Path
  1.34.2.1  +5 -0      src/sys/contrib/pf/net/pf.c
  1.11.2.1  +3 -0      src/sys/contrib/pf/net/pfvar.h