From owner-svn-src-all@freebsd.org  Tue Jul 14 09:25:11 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A518C99CD96;
 Tue, 14 Jul 2015 09:25:11 +0000 (UTC)
 (envelope-from brueffer@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 95D978FB;
 Tue, 14 Jul 2015 09:25:11 +0000 (UTC)
 (envelope-from brueffer@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6E9PB8Y076700;
 Tue, 14 Jul 2015 09:25:11 GMT (envelope-from brueffer@FreeBSD.org)
Received: (from brueffer@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6E9PBDC076699;
 Tue, 14 Jul 2015 09:25:11 GMT (envelope-from brueffer@FreeBSD.org)
Message-Id: <201507140925.t6E9PBDC076699@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brueffer set sender to
 brueffer@FreeBSD.org using -f
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Tue, 14 Jul 2015 09:25:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285529 - head/sbin/ggate/ggated
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.20
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: Tue, 14 Jul 2015 09:25:11 -0000

Author: brueffer
Date: Tue Jul 14 09:25:10 2015
New Revision: 285529
URL: https://svnweb.freebsd.org/changeset/base/285529

Log:
  If ggated's exports_find() fails, the connection is removed before
  (trying to) report the problem to the client.
  
  sendfail() is called with an already closed socket and thus it
  fails to inform the client about the problem.
  
  Fix this by calling sendfail() before connection_remove().
  
  PR:		195944
  Submitted by:	Fabian Keil
  Reviewed by:	pjd
  MFC after:	1 week

Modified:
  head/sbin/ggate/ggated/ggated.c

Modified: head/sbin/ggate/ggated/ggated.c
==============================================================================
--- head/sbin/ggate/ggated/ggated.c	Tue Jul 14 09:13:18 2015	(r285528)
+++ head/sbin/ggate/ggated/ggated.c	Tue Jul 14 09:25:10 2015	(r285529)
@@ -906,8 +906,8 @@ handshake(struct sockaddr *from, int sfd
 
 	ex = exports_find(from, &cinit, conn);
 	if (ex == NULL) {
-		connection_remove(conn);
 		sendfail(sfd, errno, NULL);
+		connection_remove(conn);
 		return (0);
 	}
 	if (conn->c_mediasize == 0) {