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:07:52 +0200 |
commit | 5c75001a96abcd50cbdb74df24c3f013188d076e (patch) | |
tree | 7373d9d49bd24fb9482e8ca3894ffdfe16b8a265 | |
parent | ed4f16ff6bed3037266f1fa682ebd32a18fce29c (diff) |
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 ad2daddafd..8835547acf 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, |