From owner-cvs-src@FreeBSD.ORG  Tue Nov 23 16:23:14 2004
Return-Path: <owner-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 ED7F316A4CE; Tue, 23 Nov 2004 16:23:13 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E3C9D43D55; Tue, 23 Nov 2004 16:23:13 +0000 (GMT)
	(envelope-from rwatson@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 iANGNDVF050515;
	Tue, 23 Nov 2004 16:23:13 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iANGNDK5050514;
	Tue, 23 Nov 2004 16:23:13 GMT
	(envelope-from rwatson)
Message-Id: <200411231623.iANGNDK5050514@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 23 Nov 2004 16:23:13 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/netinet tcp_subr.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 23 Nov 2004 16:23:14 -0000

rwatson     2004-11-23 16:23:13 UTC

  FreeBSD src repository

  Modified files:
    sys/netinet          tcp_subr.c 
  Log:
  Assert the inpcb lock in tcp_twstart(), which does both read-modify-write
  on the tcpcb, but also calls into tcp_close() and tcp_twrespond().
  
  Annotate that tcp_twrecycleable() requires the inpcb lock because it does
  a series of non-atomic reads of the tcpcb, but is currently called
  without the inpcb lock by the caller.  This is a bug.
  
  Assert the inpcb lock in tcp_twclose() as it performs a read-modify-write
  of the timewait structure/inpcb, and calls in_pcbdetach() which requires
  the lock.
  
  Assert the inpcb lock in tcp_twrespond(), as it performs multiple
  non-atomic reads of the tcptw and inpcb structures, as well as calling
  mac_create_mbuf_from_inpcb(), tcpip_fillheaders(), which require the
  inpcb lock.
  
  MFC after:      2 weeks
  
  Revision  Changes    Path
  1.210     +10 -0     src/sys/netinet/tcp_subr.c