From owner-p4-projects@FreeBSD.ORG  Mon Dec 15 21:29:28 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E95116A4D1; Mon, 15 Dec 2003 21:29:28 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 557EF16A4CE
	for <perforce@freebsd.org>; Mon, 15 Dec 2003 21:29:28 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BD01643D33
	for <perforce@freebsd.org>; Mon, 15 Dec 2003 21:29:26 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBG5TQ0B066216
	for <perforce@freebsd.org>; Mon, 15 Dec 2003 21:29:26 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBG5TQiL066213
	for perforce@freebsd.org; Mon, 15 Dec 2003 21:29:26 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Mon, 15 Dec 2003 21:29:26 -0800 (PST)
Message-Id: <200312160529.hBG5TQiL066213@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 43962 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Dec 2003 05:29:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=43962

Change 43962 by sam@sam_ebb on 2003/12/15 21:29:21

	this should fix the sbflush panic

Affected files ...

.. //depot/projects/netperf+sockets/sys/netinet/tcp_usrreq.c#4 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/netinet/tcp_usrreq.c#4 (text+ko) ====

@@ -1190,7 +1190,9 @@
 		tp = tcp_drop(tp, 0);
 	else {
 		soisdisconnecting(so);
+		SOCKBUF_LOCK(&so->so_rcv);
 		sbflush(&so->so_rcv);
+		SOCKBUF_UNLOCK(&so->so_rcv);
 		tp = tcp_usrclosed(tp);
 		if (tp)
 			(void) tcp_output(tp);