From owner-cvs-all@FreeBSD.ORG  Wed Dec 22 00:36:04 2004
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 F017516A4CE; Wed, 22 Dec 2004 00:36:04 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id DF42243D46; Wed, 22 Dec 2004 00:36:04 +0000 (GMT)
	(envelope-from dhartmei@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 iBM0a4uR091143;
	Wed, 22 Dec 2004 00:36:04 GMT
	(envelope-from dhartmei@repoman.freebsd.org)
Received: (from dhartmei@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBM0a4QP091142;
	Wed, 22 Dec 2004 00:36:04 GMT
	(envelope-from dhartmei)
Message-Id: <200412220036.iBM0a4QP091142@repoman.freebsd.org>
From: Daniel Hartmeier <dhartmei@FreeBSD.org>
Date: Wed, 22 Dec 2004 00:36:04 +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/contrib/pf/net pf.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: Wed, 22 Dec 2004 00:36:05 -0000

dhartmei    2004-12-22 00:36:04 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/contrib/pf/net   pf.c 
  Log:
  MFC 1.25: Initialise init_addr in pf_map_addr() in the PF_POOL_ROUNDROBIN,
            prevents a possible endless loop in pf_get_sport() with
            'static-port'
  
            ICMP state entries use the ICMP ID as port for the unique state
            key. When checking for a usable key, construct the key in the
            same way. Otherwise, a colliding key might be missed or a state
            insertion might be refused even though it could be inserted. The
            second case triggers the endless loop, possibly allowing a NATed
            LAN client to lock up the kernel.
  
  Revision  Changes    Path
  1.18.2.6  +6 -4      src/sys/contrib/pf/net/pf.c