From owner-svn-src-head@FreeBSD.ORG  Tue Feb 24 11:17:50 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 879C21065672;
	Tue, 24 Feb 2009 11:17:50 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 759E48FC08;
	Tue, 24 Feb 2009 11:17:50 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1OBHo9p063907;
	Tue, 24 Feb 2009 11:17:50 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1OBHoqU063906;
	Tue, 24 Feb 2009 11:17:50 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200902241117.n1OBHoqU063906@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 24 Feb 2009 11:17:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188992 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Feb 2009 11:17:50 -0000

Author: rwatson
Date: Tue Feb 24 11:17:50 2009
New Revision: 188992
URL: http://svn.freebsd.org/changeset/base/188992

Log:
  In tcp_usr_shutdown() and tcp_usr_send(), I missed converting NULL
  checks for the tcpcb, previously used to detect complete disconnection,
  with INP_DROPPED checks.  Correct that, preventing shutdown() from
  improperly generating a TCP segment with destination IP and port of
  0.0.0.0:0.
  
  PR:		kern/132050
  Reported by:	david gueluy <david.gueluy at netasq.com>
  MFC after:	3 weeks

Modified:
  head/sys/netinet/tcp_usrreq.c

Modified: head/sys/netinet/tcp_usrreq.c
==============================================================================
--- head/sys/netinet/tcp_usrreq.c	Tue Feb 24 10:48:15 2009	(r188991)
+++ head/sys/netinet/tcp_usrreq.c	Tue Feb 24 11:17:50 2009	(r188992)
@@ -695,7 +695,8 @@ tcp_usr_shutdown(struct socket *so)
 	TCPDEBUG1();
 	socantsendmore(so);
 	tcp_usrclosed(tp);
-	error = tcp_output_disconnect(tp);
+	if (!(inp->inp_vflag & INP_DROPPED))
+		error = tcp_output_disconnect(tp);
 
 out:
 	TCPDEBUG2(PRU_SHUTDOWN);
@@ -828,7 +829,7 @@ tcp_usr_send(struct socket *so, int flag
 			INP_INFO_WUNLOCK(&V_tcbinfo);
 			headlocked = 0;
 		}
-		if (tp != NULL) {
+		if (!(inp->inp_vflag & INP_DROPPED)) {
 			if (flags & PRUS_MORETOCOME)
 				tp->t_flags |= TF_MORETOCOME;
 			error = tcp_output_send(tp);