From owner-cvs-src@FreeBSD.ORG  Mon Sep 29 18:23:26 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 E5B1E106568D;
	Mon, 29 Sep 2008 18:23:26 +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 D361D8FC1F;
	Mon, 29 Sep 2008 18:23:26 +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 m8TINQWA089631;
	Mon, 29 Sep 2008 18:23:26 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8TINQ6k089630;
	Mon, 29 Sep 2008 18:23:26 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Message-Id: <200809291823.m8TINQ6k089630@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: Mon, 29 Sep 2008 18:23:08 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_7
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: Mon, 29 Sep 2008 18:23:27 -0000

rwatson     2008-09-29 18:23:08 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/netinet          tcp_input.c 
  Log:
  SVN rev 183469 on 2008-09-29 18:23:08Z by rwatson
  
  Merge r183356 from head to stable/7:
  
    As a follow-on to r183323, correct another case where ip_output() was
    called without an inpcb pointer despite holding the tcbinfo global
    lock, which lead to a deadlock or panic when ipfw tried to further
    acquire it recursively.
  
    Reported by:    Stefan Ehmann <shoesoft at gmx dot net>
  
  Approved by:    re (kib)
  
  Revision   Changes    Path
  1.370.2.7  +17 -1     src/sys/netinet/tcp_input.c