forked from pool/glibc
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
|
From a151f2e05a64727c552a297d129b8ef242ffb3b6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: DJ Delorie <dj@redhat.com>
|
||
|
|
Date: Thu, 25 Feb 2021 16:08:21 -0500
|
||
|
|
Subject: [PATCH] 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)
|
||
|
|
---
|
||
|
|
nscd/netgroupcache.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
Index: glibc-2.33/nscd/netgroupcache.c
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.33.orig/nscd/netgroupcache.c
|
||
|
|
+++ glibc-2.33/nscd/netgroupcache.c
|
||
|
|
@@ -248,7 +248,7 @@ addgetnetgrentX (struct database_dyn *db
|
||
|
|
: NULL);
|
||
|
|
ndomain = (ndomain ? newbuf + ndomaindiff
|
||
|
|
: NULL);
|
||
|
|
- buffer = newbuf;
|
||
|
|
+ *tofreep = buffer = newbuf;
|
||
|
|
}
|
||
|
|
|
||
|
|
nhost = memcpy (buffer + bufused,
|
||
|
|
@@ -319,7 +319,7 @@ addgetnetgrentX (struct database_dyn *db
|
||
|
|
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
|