From owner-svn-src-head@FreeBSD.ORG  Sat Feb 28 20:30:30 2015
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: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 3E724444;
 Sat, 28 Feb 2015 20:30:30 +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 2A8A5363;
 Sat, 28 Feb 2015 20:30:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1SKUUSE067911;
 Sat, 28 Feb 2015 20:30:30 GMT (envelope-from kan@FreeBSD.org)
Received: (from kan@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1SKUUpC067910;
 Sat, 28 Feb 2015 20:30:30 GMT (envelope-from kan@FreeBSD.org)
Message-Id: <201502282030.t1SKUUpC067910@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kan set sender to kan@FreeBSD.org
 using -f
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Sat, 28 Feb 2015 20:30:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279405 - head/sys/nfs
X-SVN-Group: head
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.18-1
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/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Feb 2015 20:30:30 -0000

Author: kan
Date: Sat Feb 28 20:30:29 2015
New Revision: 279405
URL: https://svnweb.freebsd.org/changeset/base/279405

Log:
  Avoid closing unallocated socket in case socreate fails.
  
  Found by: Brainy Code Scanner
  Reported by: Maxime Villard <max@M00nBSD.net>
  MFC after: 2 weeks

Modified:
  head/sys/nfs/krpc_subr.c

Modified: head/sys/nfs/krpc_subr.c
==============================================================================
--- head/sys/nfs/krpc_subr.c	Sat Feb 28 20:30:25 2015	(r279404)
+++ head/sys/nfs/krpc_subr.c	Sat Feb 28 20:30:29 2015	(r279405)
@@ -220,7 +220,7 @@ krpc_call(struct sockaddr_in *sa, u_int 
 	 * Create socket and set its recieve timeout.
 	 */
 	if ((error = socreate(AF_INET, &so, SOCK_DGRAM, 0, td->td_ucred, td)))
-		goto out;
+		return error;
 
 	tv.tv_sec = 1;
 	tv.tv_usec = 0;