|
 |
1feee8 |
commit e3976287b22422787f3cc6fc9adda58304b55bd9
|
|
|
1feee8 |
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
|
|
1feee8 |
Date: Tue Oct 4 18:40:25 2022 -0400
|
|
|
1feee8 |
|
|
|
1feee8 |
nscd: Drop local address tuple variable [BZ #29607]
|
|
|
1feee8 |
|
|
|
1feee8 |
When a request needs to be resent (e.g. due to insufficient buffer
|
|
|
1feee8 |
space), the references to subsequent tuples in the local variable are
|
|
|
1feee8 |
stale and should not be used. This used to work by accident before, but
|
|
|
1feee8 |
since 1d495912a it no longer does. Instead of trying to reset it, just
|
|
|
1feee8 |
let gethostbyname4_r write into TUMPBUF6 for us, thus maintaining a
|
|
|
1feee8 |
consistent state at all times. This is now consistent with what is done
|
|
|
1feee8 |
in gaih_inet for getaddrinfo.
|
|
|
1feee8 |
|
|
|
1feee8 |
Resolves: BZ #29607
|
|
|
1feee8 |
Reported-by: Holger Hoffstätte <holger@applied-asynchrony.com>
|
|
|
1feee8 |
Tested-by: Holger Hoffstätte <holger@applied-asynchrony.com>
|
|
|
1feee8 |
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
|
|
|
1feee8 |
(cherry picked from commit 6e33e5c4b73cea7b8aa3de0947123db16200fb65)
|
|
|
1feee8 |
|
|
|
1feee8 |
diff --git a/nscd/aicache.c b/nscd/aicache.c
|
|
|
1feee8 |
index 737ace11cc276021..3b300ad9b7db2297 100644
|
|
|
1feee8 |
--- a/nscd/aicache.c
|
|
|
1feee8 |
+++ b/nscd/aicache.c
|
|
|
1feee8 |
@@ -111,11 +111,10 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
|
|
|
1feee8 |
"gethostbyname4_r");
|
|
|
1feee8 |
if (fct4 != NULL)
|
|
|
1feee8 |
{
|
|
|
1feee8 |
- struct gaih_addrtuple atmem;
|
|
|
1feee8 |
struct gaih_addrtuple *at;
|
|
|
1feee8 |
while (1)
|
|
|
1feee8 |
{
|
|
|
1feee8 |
- at = &atmem;
|
|
|
1feee8 |
+ at = NULL;
|
|
|
1feee8 |
rc6 = 0;
|
|
|
1feee8 |
herrno = 0;
|
|
|
1feee8 |
status[1] = DL_CALL_FCT (fct4, (key, &at,
|
|
|
1feee8 |
@@ -138,7 +137,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
|
|
|
1feee8 |
goto next_nip;
|
|
|
1feee8 |
|
|
|
1feee8 |
/* We found the data. Count the addresses and the size. */
|
|
|
1feee8 |
- for (const struct gaih_addrtuple *at2 = at = &atmem; at2 != NULL;
|
|
|
1feee8 |
+ for (const struct gaih_addrtuple *at2 = at; at2 != NULL;
|
|
|
1feee8 |
at2 = at2->next)
|
|
|
1feee8 |
{
|
|
|
1feee8 |
++naddrs;
|