From owner-p4-projects@FreeBSD.ORG  Wed Nov  5 19:56:53 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 338DA16A4D0; Wed,  5 Nov 2003 19:56:53 -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 ED6C416A4CE
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 19:56:52 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 777B843F93
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 19:56:52 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA63uqXJ080886
	for <perforce@freebsd.org>; Wed, 5 Nov 2003 19:56:52 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA63upnR080883
	for perforce@freebsd.org; Wed, 5 Nov 2003 19:56:52 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Wed, 5 Nov 2003 19:56:52 -0800 (PST)
Message-Id: <200311060356.hA63upnR080883@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 41549 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: Thu, 06 Nov 2003 03:56:53 -0000

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

Change 41549 by sam@sam_ebb on 2003/11/05 19:56:38

	hold the inp lock across tcp_respond; it is needed to
	insure consistency of the inpcb contents

Affected files ...

.. //depot/projects/netperf/sys/netinet/tcp_input.c#9 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/tcp_input.c#9 (text+ko) ====

@@ -2348,9 +2348,6 @@
 			  &tcp_savetcp, 0);
 #endif
 
-	if (tp)
-		INP_UNLOCK(inp);
-
 	if (thflags & TH_ACK)
 		/* mtod() below is safe as long as hdr dropping is delayed */
 		tcp_respond(tp, mtod(m, void *), th, m, (tcp_seq)0, th->th_ack,
@@ -2362,6 +2359,9 @@
 		tcp_respond(tp, mtod(m, void *), th, m, th->th_seq+tlen,
 			    (tcp_seq)0, TH_RST|TH_ACK);
 	}
+
+	if (tp)
+		INP_UNLOCK(inp);
 	if (headlocked)
 		INP_INFO_WUNLOCK(&tcbinfo);
 	return;