From owner-svn-src-head@freebsd.org  Tue May 24 18:44:51 2016
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 73A45B4969D;
 Tue, 24 May 2016 18:44:51 +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 44FC513C4;
 Tue, 24 May 2016 18:44:51 +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 u4OIio8d090458;
 Tue, 24 May 2016 18:44:50 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4OIioBp090457;
 Tue, 24 May 2016 18:44:50 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605241844.u4OIioBp090457@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: Tue, 24 May 2016 18:44:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300620 - 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-head@freebsd.org
X-Mailman-Version: 2.1.22
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: Tue, 24 May 2016 18:44:51 -0000

Author: ngie
Date: Tue May 24 18:44:50 2016
New Revision: 300620
URL: https://svnweb.freebsd.org/changeset/base/300620

Log:
  Use reallocf instead of malloc to fix leak with outbuf_pmap
  
  The previous code overwrote outbuf_pmap's memory with malloc once per
  loop iteration, which leaked its memory; use reallocf instead to ensure
  that memory is properly free'd each loop iteration.
  
  Add a outbuf_pmap = NULL in the failure case to avoid a double-free
  at the bottom of the function.
  
  Differential Revision: https://reviews.freebsd.org/D6495
  MFC after: 1 week
  Reported by: Coverity
  CID: 1038776
  Reviewed by: markj, pfgj
  Sponsored by: EMC / Isilon Storage Division

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

Modified: head/lib/libc/rpc/clnt_bcast.c
==============================================================================
--- head/lib/libc/rpc/clnt_bcast.c	Tue May 24 17:38:27 2016	(r300619)
+++ head/lib/libc/rpc/clnt_bcast.c	Tue May 24 18:44:50 2016	(r300620)
@@ -346,7 +346,9 @@ rpc_broadcast_exp(rpcprog_t prog, rpcver
 #ifdef PORTMAP
 		if (si.si_af == AF_INET && si.si_proto == IPPROTO_UDP) {
 			udpbufsz = fdlist[fdlistno].dsize;
-			if ((outbuf_pmap = malloc(udpbufsz)) == NULL) {
+			outbuf_pmap = reallocf(outbuf_pmap, udpbufsz);
+			if (outbuf_pmap == NULL) {
+				outbuf_pmap = NULL;
 				_close(fd);
 				stat = RPC_SYSTEMERROR;
 				goto done_broad;