From owner-svn-src-all@freebsd.org  Wed May 25 00:25:40 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 0E3BAB48649;
 Wed, 25 May 2016 00:25:40 +0000 (UTC)
 (envelope-from truckman@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 D39431A4A;
 Wed, 25 May 2016 00:25:39 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4P0Pdf3096238;
 Wed, 25 May 2016 00:25:39 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4P0PdXH096237;
 Wed, 25 May 2016 00:25:39 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201605250025.u4P0PdXH096237@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Wed, 25 May 2016 00:25:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300636 - head/usr.sbin/ypserv
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.22
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: Wed, 25 May 2016 00:25:40 -0000

Author: truckman
Date: Wed May 25 00:25:38 2016
New Revision: 300636
URL: https://svnweb.freebsd.org/changeset/base/300636

Log:
  Delay calling yp_malloc_dnsent() until after some additional sanity
  checks to avoid leaking memory on error returns.
  
  Reported by:	Coverity
  CID:		1007416
  MFC after:	1 week

Modified:
  head/usr.sbin/ypserv/yp_dnslookup.c

Modified: head/usr.sbin/ypserv/yp_dnslookup.c
==============================================================================
--- head/usr.sbin/ypserv/yp_dnslookup.c	Wed May 25 00:16:52 2016	(r300635)
+++ head/usr.sbin/ypserv/yp_dnslookup.c	Wed May 25 00:25:38 2016	(r300636)
@@ -489,9 +489,6 @@ yp_async_lookup_addr(struct svc_req *rqs
 	    yp_find_dnsqent(svcudp_get_xid(rqstp->rq_xprt),BY_RPC_XID) != NULL)
 		return(YP_TRUE);
 
-	if ((q = yp_malloc_dnsent()) == NULL)
-		return(YP_YPERR);
-
 	switch (af) {
 	case AF_INET:
 		if (inet_aton(addr, (struct in_addr *)uaddr) != 1)
@@ -516,6 +513,9 @@ yp_async_lookup_addr(struct svc_req *rqs
 		return(YP_YPERR);
 	}
 
+	if ((q = yp_malloc_dnsent()) == NULL)
+		return(YP_YPERR);
+
 	if (debug)
 		yp_error("DNS address is: %s", buf);