From owner-svn-src-stable@freebsd.org  Mon Jan 18 03:47:47 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 DE4F6A86611;
 Mon, 18 Jan 2016 03:47:47 +0000 (UTC)
 (envelope-from ngie@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 ADBFD1B39;
 Mon, 18 Jan 2016 03:47:47 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0I3lkX8093809;
 Mon, 18 Jan 2016 03:47:46 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0I3lksD093808;
 Mon, 18 Jan 2016 03:47:46 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601180347.u0I3lksD093808@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 18 Jan 2016 03:47:46 +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: r294239 - stable/10/lib/libc/rpc
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@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jan 2016 03:47:48 -0000

Author: ngie
Date: Mon Jan 18 03:47:46 2016
New Revision: 294239
URL: https://svnweb.freebsd.org/changeset/base/294239

Log:
  MFC r293704:
  
  Fix theoretical leak of netconfig(3) resources in svcunix_create(..)
  
  In the event that the getconfig(3) call in svcunix_create is partly successful,
  some of the netconfig(3) resources allocated might be leaked if the call returns
  NULL as endnetconfig(3) wasn't called explicitly in that case. Ensure that the
  resources are fully cleaned up by going to the `done` label, which will call
  endnetconfig(3) for us.
  
  Submitted by: Miles Ohlrich <miles.ohlrich@isilon.com>

Modified:
  stable/10/lib/libc/rpc/rpc_soc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/rpc/rpc_soc.c
==============================================================================
--- stable/10/lib/libc/rpc/rpc_soc.c	Mon Jan 18 00:07:04 2016	(r294238)
+++ stable/10/lib/libc/rpc/rpc_soc.c	Mon Jan 18 03:47:46 2016	(r294239)
@@ -525,7 +525,7 @@ svcunix_create(sock, sendsize, recvsize,
 			break;
 	}
 	if (nconf == NULL)
-		return(xprt);
+		goto done;
 
 	if ((sock = __rpc_nconf2fd(nconf)) < 0)
 		goto done;