From owner-cvs-src@FreeBSD.ORG Wed Jul 20 18:58:27 2005 Return-Path: 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 9164216A41F; Wed, 20 Jul 2005 18:58:27 +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 4D72643D49; Wed, 20 Jul 2005 18:58:27 +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 j6KIwRpb097686; Wed, 20 Jul 2005 18:58:27 GMT (envelope-from mlaier@repoman.freebsd.org) Received: (from mlaier@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6KIwRNZ097685; Wed, 20 Jul 2005 18:58:27 GMT (envelope-from mlaier) Message-Id: <200507201858.j6KIwRNZ097685@repoman.freebsd.org> From: Max Laier Date: Wed, 20 Jul 2005 18:58:27 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jul 2005 18:58:27 -0000 mlaier 2005-07-20 18:58:27 UTC FreeBSD src repository Modified files: sys/contrib/pf/net pf.c pfvar.h Log: 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 MFC after: 2 weeks Revision Changes Path 1.35 +5 -0 src/sys/contrib/pf/net/pf.c 1.12 +3 -0 src/sys/contrib/pf/net/pfvar.h