From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2012) id 227D03858C62; Fri, 7 Oct 2022 14:34:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 227D03858C62 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665153258; bh=AtHyoQikfq5hmjD/5f5smt3/Lph4CRxJa2NmBTLZXYU=; h=From:To:Subject:Date:From; b=FD6GD9VC5TUGmvkcEE2Apvnf6cErKpNDFLHemjZNwDcyw0D7OfEeCedAlznIqsb9N fGhw1gKz/F/DlCrydhdkn3IGVxYt+2UbhftzQT9Qa/3TVHAv27vHlNDm3Qmpr+aqOT WdCqUY0kNX/rXjFVU/dBf3jcOxtZfALHo8H8Bxaw= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Arjun Shankar To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] nscd: Drop local address tuple variable [BZ #29607] X-Act-Checkin: glibc X-Git-Author: Siddhesh Poyarekar X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: 20152a849b34abe83c702b27b7276c96b191b644 X-Git-Newrev: bca80a916e1a7fda51d0f30e9cfb5b111f8a2a7a Message-Id: <20221007143418.227D03858C62@sourceware.org> Date: Fri, 7 Oct 2022 14:34:18 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bca80a916e1a7fda51d0f30e9cfb5b111f8a2a7a commit bca80a916e1a7fda51d0f30e9cfb5b111f8a2a7a Author: Siddhesh Poyarekar Date: Tue Oct 4 18:40:25 2022 -0400 nscd: Drop local address tuple variable [BZ #29607] 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 Tested-by: Holger Hoffstätte Reviewed-by: Carlos O'Donell (cherry picked from commit 6e33e5c4b73cea7b8aa3de0947123db16200fb65) Diff: --- nscd/aicache.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nscd/aicache.c b/nscd/aicache.c index 51e793199f..e0baed170b 100644 --- a/nscd/aicache.c +++ b/nscd/aicache.c @@ -110,11 +110,10 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, "gethostbyname4_r"); if (fct4 != NULL) { - struct gaih_addrtuple atmem; struct gaih_addrtuple *at; while (1) { - at = &atmem; + at = NULL; rc6 = 0; herrno = 0; 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; /* 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) { ++naddrs;