about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2021-02-25 16:08:21 -0500
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2021-03-08 15:26:15 +0530
commit1d4526569162e6c8f0789eb077492730b0756b3b (patch)
tree7b101e94df58e7b760c762453bc120c2b3311a04
parent760e1d287825fa91d4d5a0cc921340c740d803e2 (diff)
downloadglibc-1d4526569162e6c8f0789eb077492730b0756b3b.tar.gz
glibc-1d4526569162e6c8f0789eb077492730b0756b3b.tar.xz
glibc-1d4526569162e6c8f0789eb077492730b0756b3b.zip
nscd: Fix double free in netgroupcache [BZ #27462]
In commit 745664bd798ec8fd50438605948eea594179fba1 a use-after-free
was fixed, but this led to an occasional double-free.  This patch
tracks the "live" allocation better.

Tested manually by a third party.

Related: RHBZ 1927877

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
(cherry picked from commit dca565886b5e8bd7966e15f0ca42ee5cff686673)
-rw-r--r--nscd/netgroupcache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c
index 88c69d1e9c..381aa721ef 100644
--- a/nscd/netgroupcache.c
+++ b/nscd/netgroupcache.c
@@ -248,7 +248,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
 					     : NULL);
 				    ndomain = (ndomain ? newbuf + ndomaindiff
 					       : NULL);
-				    buffer = newbuf;
+				    *tofreep = buffer = newbuf;
 				  }
 
 				nhost = memcpy (buffer + bufused,
@@ -319,7 +319,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
 		    else if (status == NSS_STATUS_TRYAGAIN && e == ERANGE)
 		      {
 			buflen *= 2;
-			buffer = xrealloc (buffer, buflen);
+			*tofreep = buffer = xrealloc (buffer, buflen);
 		      }
 		    else if (status == NSS_STATUS_RETURN
 			     || status == NSS_STATUS_NOTFOUND