From owner-svn-src-all@freebsd.org  Mon Jan 11 21:56:55 2016
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 24DB6A6C706;
 Mon, 11 Jan 2016 21:56:55 +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 EC64D10CC;
 Mon, 11 Jan 2016 21:56:54 +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 u0BLusbf012835;
 Mon, 11 Jan 2016 21:56:54 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0BLus2L012834;
 Mon, 11 Jan 2016 21:56:54 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601112156.u0BLus2L012834@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, 11 Jan 2016 21:56:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r293704 - head/lib/libc/rpc
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jan 2016 21:56:55 -0000

Author: ngie
Date: Mon Jan 11 21:56:53 2016
New Revision: 293704
URL: https://svnweb.freebsd.org/changeset/base/293704

Log:
  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.
  
  MFC after: 1 week
  Reported by: Coverity
  Submitted by: Miles Ohlrich <miles.ohlrich@isilon.com>
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/rpc/rpc_soc.c

Modified: head/lib/libc/rpc/rpc_soc.c
==============================================================================
--- head/lib/libc/rpc/rpc_soc.c	Mon Jan 11 21:46:37 2016	(r293703)
+++ head/lib/libc/rpc/rpc_soc.c	Mon Jan 11 21:56:53 2016	(r293704)
@@ -483,7 +483,7 @@ svcunix_create(int sock, u_int sendsize,
 			break;
 	}
 	if (nconf == NULL)
-		return(xprt);
+		goto done;
 
 	if ((sock = __rpc_nconf2fd(nconf)) < 0)
 		goto done;