aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2024-04-25 15:00:45 +0200
committerFlorian Weimer <fweimer@redhat.com>2024-04-25 15:37:18 +0200
commit1263d583d2e28afb8be53f8d6922f0842036f35d (patch)
tree7066258ed8c136a76f1881be09626fe1a0abf94f
parent2f8f157eb0cc7f1d8d9a3fcaa8c55bed53b092a8 (diff)
downloadglibc-1263d583d2e28afb8be53f8d6922f0842036f35d.zip
glibc-1263d583d2e28afb8be53f8d6922f0842036f35d.tar.gz
glibc-1263d583d2e28afb8be53f8d6922f0842036f35d.tar.bz2
CVE-2024-33599: nscd: Stack-based buffer overflow in netgroup cache (bug 31677)
Using alloca matches what other caches do. The request length is bounded by MAXKEYLEN. Reviewed-by: Carlos O'Donell <carlos@redhat.com> (cherry picked from commit 87801a8fd06db1d654eea3e4f7626ff476a9bdaa)
-rw-r--r--nscd/netgroupcache.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c
index 0c6e46f..f227dc7 100644
--- a/nscd/netgroupcache.c
+++ b/nscd/netgroupcache.c
@@ -502,12 +502,13 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req,
= (struct indataset *) mempool_alloc (db,
sizeof (*dataset) + req->key_len,
1);
- struct indataset dataset_mem;
bool cacheable = true;
if (__glibc_unlikely (dataset == NULL))
{
cacheable = false;
- dataset = &dataset_mem;
+ /* The alloca is safe because nscd_run_worker verfies that
+ key_len is not larger than MAXKEYLEN. */
+ dataset = alloca (sizeof (*dataset) + req->key_len);
}
datahead_init_pos (&dataset->head, sizeof (*dataset) + req->key_len,