From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 9F30A39960E9; Tue, 30 Aug 2022 08:04:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9F30A39960E9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1661846655; bh=epW6A/YdJNA6dFvWnx4fAko8/Nh6GhKVs62Y+NoDSpk=; h=From:To:Subject:Date:From; b=UgFn1EEP6H8iymq9qAmb/EkrfDRbmA6zwc2Cpz6UY1UyF829xndnNxhQ4SscW3pqe KFU3RJk8M/sjLbxJYW3Tu0jTUxYEA1netnVh8dinFamQt1pP2YPNZ1iX2GuuA0h+G5 GaThmfJFYO2ow7aZeKO2WdlzBVIg9nUsOntzTPbI= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] nss_dns: In gaih_getanswer_slice, skip strange aliases (bug 12154) X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: d101d836e7e4bd1d4e4972b0e0bd0a55c9b650fa X-Git-Newrev: 32b599ac8c21c4c332cc3900a792a1395bca79c7 Message-Id: <20220830080415.9F30A39960E9@sourceware.org> Date: Tue, 30 Aug 2022 08:04:15 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=32b599ac8c21c4c332cc3900a792a1395bca79c7 commit 32b599ac8c21c4c332cc3900a792a1395bca79c7 Author: Florian Weimer Date: Tue Aug 30 10:02:49 2022 +0200 nss_dns: In gaih_getanswer_slice, skip strange aliases (bug 12154) If the name is not a host name, skip adding it to the result, instead of reporting query failure. This fixes bug 12154 for getaddrinfo. This commit still keeps the old parsing code, and only adjusts when a host name is copied. Reviewed-by: Siddhesh Poyarekar Diff: --- resolv/nss_dns/dns-host.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index b887e77e9c..bea505d697 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -970,12 +970,12 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname, n = -1; } - if (__glibc_unlikely (n < 0 || __libc_res_hnok (buffer) == 0)) + if (__glibc_unlikely (n < 0)) { ++had_error; continue; } - if (*firstp && canon == NULL) + if (*firstp && canon == NULL && __libc_res_hnok (buffer)) { h_name = buffer; buffer += h_namelen; @@ -1021,14 +1021,14 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname, n = __libc_dn_expand (answer->buf, end_of_message, cp, tbuf, sizeof tbuf); - if (__glibc_unlikely (n < 0 || __libc_res_hnok (tbuf) == 0)) + if (__glibc_unlikely (n < 0)) { ++had_error; continue; } cp += n; - if (*firstp) + if (*firstp && __libc_res_hnok (tbuf)) { /* Reclaim buffer space. */ if (h_name + h_namelen == buffer)