AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-27 23:40:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

nscd: Drop local address tuple variable [BZ #29607]

Browse Source 
When a request needs to be resent (e.g. due to insufficient buffer
space), the references to subsequent tuples in the local variable are
stale and should not be used.  This used to work by accident before, but
since 1d495912a it no longer does.  Instead of trying to reset it, just
let gethostbyname4_r write into TUMPBUF6 for us, thus maintaining a
consistent state at all times.  This is now consistent with what is done
in gaih_inet for getaddrinfo.

Resolves: BZ #29607
Reported-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Tested-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Siddhesh Poyarekar 2022-10-04 18:40:25 -04:00
parent 1f3f0060a1
commit 6e33e5c4b7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nscd/aicache.c
View File

@ -110,11 +110,10 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
"gethostbyname4_r"); "gethostbyname4_r");
if (fct4 != NULL) if (fct4 != NULL)
{ {
struct gaih_addrtuple atmem;
struct gaih_addrtuple *at; struct gaih_addrtuple *at;
while (1) while (1)
{ {
at = &atmem; at = NULL;
rc6 = 0; rc6 = 0;
herrno = 0; herrno = 0;
status[1] = DL_CALL_FCT (fct4, (key, &at, status[1] = DL_CALL_FCT (fct4, (key, &at,
@ -137,7 +136,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
goto next_nip; goto next_nip;
/* We found the data. Count the addresses and the size. */ /* We found the data. Count the addresses and the size. */
for (const struct gaih_addrtuple *at2 = at = &atmem; at2 != NULL; for (const struct gaih_addrtuple *at2 = at; at2 != NULL;
at2 = at2->next) at2 = at2->next)
{ {
++naddrs; ++naddrs;