Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 May 2016 18:44:50 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r300620 - head/lib/libc/rpc
Message-ID:  <201605241844.u4OIioBp090457@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605241844.u4OIioBp090457>