From owner-cvs-src@FreeBSD.ORG  Wed Sep 24 11:07:18 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1052F106564A;
	Wed, 24 Sep 2008 11:07:18 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 011778FC2E;
	Wed, 24 Sep 2008 11:07:18 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OB7HHY095541;
	Wed, 24 Sep 2008 11:07:17 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OB7Hgs095540;
	Wed, 24 Sep 2008 11:07:17 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Message-Id: <200809241107.m8OB7Hgs095540@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	rwatson@repoman.freebsd.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 24 Sep 2008 11:07:03 +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/netinet tcp_input.c
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: Wed, 24 Sep 2008 11:07:18 -0000

rwatson     2008-09-24 11:07:03 UTC

  FreeBSD src repository

  Modified files:
    sys/netinet          tcp_input.c 
  Log:
  SVN rev 183323 on 2008-09-24 11:07:03Z by rwatson
  
  When dropping a packet and issuing a reset during TCP segment handling,
  unconditionally drop the tcbinfo lock (after all, we assert it lines
  before), but call tcp_dropwithreset() under both inpcb and inpcbinfo
  locks only if we pass in an tcpcb.  Otherwise, if the pointer is NULL,
  firewall code may later recurse the global tcbinfo lock trying to look
  up an inpcb.
  
  This is an instance where a layering violation leads not only
  potentially to code reentrace and recursion, but also to lock
  recursion, and was revealed by the conversion to rwlocks because
  acquiring a read lock on an rwlock already held with a write lock is
  forbidden.  When these locks were mutexes, they simply recursed.
  
  Reported by:    Stefan Ehmann <shoesoft at gmx dot net>
  MFC after:      3 days
  
  Revision  Changes    Path
  1.382     +12 -5     src/sys/netinet/tcp_input.c