diff options
| author | Florian Weimer <fweimer@redhat.com> | 2024-04-25 15:00:45 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2024-04-25 16:10:32 +0200 |
| commit | a77064893bfe8a701770e2f53a4d33805bc47a5a (patch) | |
| tree | 88db39257f9d3d2748a9ee0b9014ed687d6ba18a | |
| parent | 682ad4c8623e611a971839990ceef00346289cc9 (diff) | |
| download | glibc-a77064893bfe8a701770e2f53a4d33805bc47a5a.tar.gz glibc-a77064893bfe8a701770e2f53a4d33805bc47a5a.tar.xz glibc-a77064893bfe8a701770e2f53a4d33805bc47a5a.zip | |
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.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c index 381aa721ef..a833ef039e 100644 --- a/nscd/netgroupcache.c +++ b/nscd/netgroupcache.c @@ -503,12 +503,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, |