From owner-svn-src-stable-10@FreeBSD.ORG  Fri May 15 12:35:19 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 46AFD1BC;
 Fri, 15 May 2015 12:35:19 +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 3516315C2;
 Fri, 15 May 2015 12:35:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4FCZJOr017696;
 Fri, 15 May 2015 12:35:19 GMT (envelope-from jch@FreeBSD.org)
Received: (from jch@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4FCZJTw017695;
 Fri, 15 May 2015 12:35:19 GMT (envelope-from jch@FreeBSD.org)
Message-Id: <201505151235.t4FCZJTw017695@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: Fri, 15 May 2015 12:35:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r282968 - stable/10/sys/netinet
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 May 2015 12:35:19 -0000

Author: jch
Date: Fri May 15 12:35:18 2015
New Revision: 282968
URL: https://svnweb.freebsd.org/changeset/base/282968

Log:
  MFC r279821:
  
      In TCP, connect() can return incorrect error code EINVAL
      instead of EADDRINUSE or ECONNREFUSED
  
      PR:                         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

Modified:
  stable/10/sys/netinet/tcp_usrreq.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/tcp_usrreq.c
==============================================================================
--- stable/10/sys/netinet/tcp_usrreq.c	Fri May 15 12:32:17 2015	(r282967)
+++ stable/10/sys/netinet/tcp_usrreq.c	Fri May 15 12:35:18 2015	(r282968)
@@ -475,8 +475,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);
@@ -522,8 +526,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);