From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2012) id 5A0C13858282; Fri, 7 Oct 2022 14:34:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5A0C13858282 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665153280; bh=tWQ9LA5u0uRyLWrp356KlFHIE/izlUJqyEiJNe5OEY8=; h=From:To:Subject:Date:From; b=hwxvROEZjOLcbvgU5XPTd5wVn5iG97bAo9gsMOYXP3rBT3mG1c13Z9w8DUKi5MVYi B3k5e4uh1V5ZGhbPhdeSLEMYOKxGsTs7oLCYQe+qgV2AsqwPc8pmxtNbmD+IhY6z0G V8icYcphf7yChlKqKj/c4eGtsXYBxe9xKIVOzZ6M= 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.34/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.34/master X-Git-Oldrev: e570b865b53f33453d97160791a7d97e38bcc6e8 X-Git-Newrev: e3976287b22422787f3cc6fc9adda58304b55bd9 Message-Id: <20221007143440.5A0C13858282@sourceware.org> Date: Fri, 7 Oct 2022 14:34:40 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e3976287b22422787f3cc6fc9adda58304b55bd9 commit e3976287b22422787f3cc6fc9adda58304b55bd9 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 737ace11cc..3b300ad9b7 100644 --- a/nscd/aicache.c +++ b/nscd/aicache.c @@ -111,11 +111,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, @@ -138,7 +137,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;