From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH 2/4] nscd: Do not send missing not-found response in addgetnetgrentX (bug 31678)
Date: Wed, 24 Apr 2024 18:08:44 +0200 [thread overview]
Message-ID: <90f1fccc39a22663a5c57c4e7c938480ada61d87.1713974801.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1713974801.git.fweimer@redhat.com>
If we failed to add a not-found response to the cache, the dataset
point can be null, resulting in a null pointer dereference.
---
nscd/netgroupcache.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c
index 24fbac7668..8709fb77b6 100644
--- a/nscd/netgroupcache.c
+++ b/nscd/netgroupcache.c
@@ -147,7 +147,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));
@@ -348,7 +348,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;
@@ -410,14 +410,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. */
--
2.44.0
next prev parent reply other threads:[~2024-04-24 16:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 16:08 [PATCH 0/4] Various nscd security fixes Florian Weimer
2024-04-24 16:08 ` [PATCH 1/4] nscd: Stack-based buffer overflow in netgroup cache (bug 31677) Florian Weimer
2024-04-24 16:27 ` Siddhesh Poyarekar
2024-04-24 16:08 ` Florian Weimer [this message]
2024-04-24 16:35 ` [PATCH 2/4] nscd: Do not send missing not-found response in addgetnetgrentX (bug 31678) Siddhesh Poyarekar
2024-04-24 16:08 ` [PATCH 3/4] nscd: Avoid null pointer crashes after notfound response " Florian Weimer
2024-04-24 16:39 ` Siddhesh Poyarekar
2024-04-24 16:08 ` [PATCH 4/4] nscd: netgroup: Use two buffers in addgetnetgrentX (bug 31680) Florian Weimer
2024-04-24 16:48 ` Siddhesh Poyarekar
2024-04-24 20:53 ` [PATCH 0/4] Various nscd security fixes Carlos O'Donell
2024-04-26 0:10 ` Cristian Rodríguez
2024-04-26 8:10 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=90f1fccc39a22663a5c57c4e7c938480ada61d87.1713974801.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).