diff options
| author | Florian Weimer <fweimer@redhat.com> | 2024-04-25 15:01:07 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2024-04-25 16:12:02 +0200 |
| commit | 304ce5fe466c4762b21b36c26926a4657b59b53e (patch) | |
| tree | 446c67ee94b9430a424459b60bf6da5299e3bfd5 | |
| parent | 69c58d5ef9f584ea198bd00f7964d364d0e6b921 (diff) | |
| download | glibc-304ce5fe466c4762b21b36c26926a4657b59b53e.tar.gz glibc-304ce5fe466c4762b21b36c26926a4657b59b53e.tar.xz glibc-304ce5fe466c4762b21b36c26926a4657b59b53e.zip | |
CVE-2024-33600: nscd: Do not send missing not-found response in addgetnetgrentX (bug 31678)
If we failed to add a not-found response to the cache, the dataset point can be null, resulting in a null pointer dereference. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> (cherry picked from commit 7835b00dbce53c3c87bbbb1754a95fb5e58187aa)
| -rw-r--r-- | nscd/netgroupcache.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c index a833ef039e..c99cf5791b 100644 --- a/nscd/netgroupcache.c +++ b/nscd/netgroupcache.c @@ -148,7 +148,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, /* No such service. */ cacheable = do_notfound (db, fd, req, key, &dataset, &total, &timeout, &key_copy); - goto writeout; + goto maybe_cache_add; } memset (&data, '\0', sizeof (data)); @@ -349,7 +349,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, { cacheable = do_notfound (db, fd, req, key, &dataset, &total, &timeout, &key_copy); - goto writeout; + goto maybe_cache_add; } total = buffilled; @@ -411,14 +411,12 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, } if (he == NULL && fd != -1) - { - /* We write the dataset before inserting it to the database - since while inserting this thread might block and so would - unnecessarily let the receiver wait. */ - writeout: + /* We write the dataset before inserting it to the database since + while inserting this thread might block and so would + unnecessarily let the receiver wait. */ writeall (fd, &dataset->resp, dataset->head.recsize); - } + maybe_cache_add: if (cacheable) { /* If necessary, we also propagate the data to disk. */ |