From owner-svn-src-head@freebsd.org  Thu Dec 28 05:34:28 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 3F506EA7C7F;
 Thu, 28 Dec 2017 05:34:28 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 74C8F6BD26;
 Thu, 28 Dec 2017 05:34:25 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBS5YOi3024794;
 Thu, 28 Dec 2017 05:34:24 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBS5YOfr024793;
 Thu, 28 Dec 2017 05:34:24 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201712280534.vBS5YOfr024793@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 28 Dec 2017 05:34:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327276 - head/sbin/routed
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/sbin/routed
X-SVN-Commit-Revision: 327276
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Dec 2017 05:34:28 -0000

Author: imp
Date: Thu Dec 28 05:34:24 2017
New Revision: 327276
URL: https://svnweb.freebsd.org/changeset/base/327276

Log:
  When bind fails, make sure we closed the socket we tried to bind the
  address to.
  
  CID: 978244

Modified:
  head/sbin/routed/main.c

Modified: head/sbin/routed/main.c
==============================================================================
--- head/sbin/routed/main.c	Thu Dec 28 05:34:19 2017	(r327275)
+++ head/sbin/routed/main.c	Thu Dec 28 05:34:24 2017	(r327276)
@@ -667,6 +667,7 @@ get_rip_sock(naddr addr,
 	if (bind(s, (struct sockaddr *)&rsin, sizeof(rsin)) < 0) {
 		if (serious)
 			BADERR(errno != EADDRINUSE, "bind(rip_sock)");
+		close(s);
 		return -1;
 	}
 	fix_sock(s,"rip_sock");