From owner-svn-src-all@FreeBSD.ORG  Mon Mar  9 20:29:17 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8C8E0400;
 Mon,  9 Mar 2015 20:29:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 77A28795;
 Mon,  9 Mar 2015 20:29:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t29KTHnB021184;
 Mon, 9 Mar 2015 20:29:17 GMT (envelope-from jch@FreeBSD.org)
Received: (from jch@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t29KTHRV021183;
 Mon, 9 Mar 2015 20:29:17 GMT (envelope-from jch@FreeBSD.org)
Message-Id: <201503092029.t29KTHRV021183@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jch set sender to jch@FreeBSD.org
 using -f
From: Julien Charbon <jch@FreeBSD.org>
Date: Mon, 9 Mar 2015 20:29:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279821 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Mar 2015 20:29:17 -0000

Author: jch
Date: Mon Mar  9 20:29:16 2015
New Revision: 279821
URL: https://svnweb.freebsd.org/changeset/base/279821

Log:
  In TCP, connect() can return incorrect error code EINVAL
  instead of EADDRINUSE or ECONNREFUSED
  
  PR:			https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196035
  Differential Revision:	https://reviews.freebsd.org/D1982
  Reported by:		Mark Nunberg <mnunberg@haskalah.org>
  Submitted by:		Harrison Grundy <harrison.grundy@astrodoggroup.com>
  Reviewed by:		adrian, jch, glebius, gnn
  Approved by:		jhb
  MFC after:		2 weeks

Modified:
  head/sys/netinet/tcp_usrreq.c

Modified: head/sys/netinet/tcp_usrreq.c
==============================================================================
--- head/sys/netinet/tcp_usrreq.c	Mon Mar  9 20:26:42 2015	(r279820)
+++ head/sys/netinet/tcp_usrreq.c	Mon Mar  9 20:29:16 2015	(r279821)
@@ -476,8 +476,12 @@ tcp_usr_connect(struct socket *so, struc
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_usr_connect: inp == NULL"));
 	INP_WLOCK(inp);
-	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
-		error = EINVAL;
+	if (inp->inp_flags & INP_TIMEWAIT) {
+		error = EADDRINUSE;
+		goto out;
+	}
+	if (inp->inp_flags & INP_DROPPED) {
+		error = ECONNREFUSED;
 		goto out;
 	}
 	tp = intotcpcb(inp);
@@ -523,8 +527,12 @@ tcp6_usr_connect(struct socket *so, stru
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp6_usr_connect: inp == NULL"));
 	INP_WLOCK(inp);
-	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
-		error = EINVAL;
+	if (inp->inp_flags & INP_TIMEWAIT) {
+		error = EADDRINUSE;
+		goto out;
+	}
+	if (inp->inp_flags & INP_DROPPED) {
+		error = ECONNREFUSED;
 		goto out;
 	}
 	tp = intotcpcb(inp);