From owner-cvs-all@FreeBSD.ORG  Tue Oct 12 17:36:46 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 1BEFB16A4CE; Tue, 12 Oct 2004 17:36:46 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1438B43D48; Tue, 12 Oct 2004 17:36:46 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9CHajVr028896;
	Tue, 12 Oct 2004 17:36:45 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9CHajWR028895;
	Tue, 12 Oct 2004 17:36:45 GMT
	(envelope-from rwatson)
Message-Id: <200410121736.i9CHajWR028895@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 12 Oct 2004 17:36:45 +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/netinet tcp_output.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: Tue, 12 Oct 2004 17:36:46 -0000

rwatson     2004-10-12 17:36:45 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/netinet          tcp_output.c 
  Log:
  Merge tcp_output.c:1.103 from HEAD to RELENG_5:
  
    date: 2004/10/09 16:48:51;  author: rwatson;  state: Exp;  lines: +14 -2
    Acquire the send socket buffer lock around tcp_output() activities
    reaching into the socket buffer.  This prevents a number of potential
    races, including dereferencing of sb_mb while unlocked leading to
    a NULL pointer deref (how I found it).  Potentially this might also
    explain other "odd" TCP behavior on SMP boxes (although  haven't
    seen it reported).
  
  Approved by:    re (kensmith)
  
  Revision   Changes    Path
  1.100.2.1  +14 -2     src/sys/netinet/tcp_output.c