From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eastern.birch.relay.mailchannels.net (eastern.birch.relay.mailchannels.net [23.83.209.55]) by sourceware.org (Postfix) with ESMTPS id B354F3858D32 for ; Tue, 23 Aug 2022 12:23:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B354F3858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 3DB5F122203; Tue, 23 Aug 2022 12:23:31 +0000 (UTC) Received: from pdx1-sub0-mail-a306.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 9606C1218EA; Tue, 23 Aug 2022 12:23:30 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1661257410; a=rsa-sha256; cv=none; b=GTPy5hNs6Z6r5luoJ81Win10CDXnZhsD53SqDDu6EWGmBJladnYmJXI+QD7maukpBMowj0 +ZMcoHOUsnKUMaHkTSLew3WBwS6lNFiXonJ7TDVlqDdaArBO9+5xZXd5WWNRs66pDXGqqZ 51NkKhGsH8eVOob+mfQ5GN/SJp8oICz98e+u6YxxJjcYMvlKKqgI9ouN2vi8oGx2jJ8RxR diHKI+EoSGJgmz0EviNmIpyNgr7/2MQk4HSKIutyw5gugLshs0Rx4HLfzhydI7/jcRQ7gJ odonPQlr6/gpS6JHhrQec9x7CjprfeGPsTYr0ajyjShvclhfAGBu8Pm+5fAuIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1661257410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=e/ngmrzEbo6qqkS7752O5kPEvAKjU0A7jvxv7xHMaxE=; b=FNKSJYaGTCUQ00o07Q2KCHZcejURI9S1OCfBuYbIJvWuXC1m5ZTrTyRDq0qhyiLsN95EQe pX03bGEtGQ7+DLX8qcvvdTADRuezg2W4UtBlpv1IEpRMKye63932pSt5+jqGW5eOSlpcsb tIahc3dcrg/ABNYUYC57OHfatvS1hZo9cr94xqaV+h/g5Sa/03z8J6pOnduKt8MtPcqt6T U92gXPEAucqfJJprpV4llKJj711ctvQwcQV6vPFpth3sXVDisSJYlDIa+guu4LgrLSNI3c rtqhPpc0/GFx7y3NSCmhn8CASRD0nPvAigdCqzIZzEJdFhTIA0ZogsC6B1eYXQ== ARC-Authentication-Results: i=1; rspamd-79945fd77c-vbjzp; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Chief-Inform: 04fbb02f0e56d1c9_1661257410838_17727523 X-MC-Loop-Signature: 1661257410838:3717004118 X-MC-Ingress-Time: 1661257410838 Received: from pdx1-sub0-mail-a306.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.108.161.97 (trex/6.7.1); Tue, 23 Aug 2022 12:23:30 +0000 Received: from [192.168.0.182] (bras-vprn-toroon4834w-lp130-16-184-147-84-238.dsl.bell.ca [184.147.84.238]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a306.dreamhost.com (Postfix) with ESMTPSA id 4MBpKs6vC7zPX; Tue, 23 Aug 2022 05:23:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1661257410; bh=e/ngmrzEbo6qqkS7752O5kPEvAKjU0A7jvxv7xHMaxE=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=r2+eP5KZ0nZ0kt3/4qPsqIqg6PHzL+PLm6pHmfl2EL/ue9NLwnPxRCuLcg/0IdXvO s10Ql9Xa/DonU0PMYv+vwOCQHNjdPiHYziqIC8JwyA5v4APb3CfDBjMDIFw090wQb/ LcLeso6EyjMurwCO7yfwaZq9tpZ2yhd0T+xFshvmhXRsMyLvBD6AF1l0QEMAhty2qr IaWmHL3k524vLY1UkHTbnMOF2AZIuDj62qGmLYiqzrOYtkD5oWpKS9CuzBH6+xVSSQ RJYf5edpM887GitVbFnFYLa+/CxMZX/N3BUGN5stPWjZPHqDPG8POpt+/C4zduGC65 Rmz+tkp9eW96w== Message-ID: Date: Tue, 23 Aug 2022 08:23:28 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH 11/13] nss_dns: In gaih_getanswer_slice, skip strange aliases (bug 12154) Content-Language: en-US To: Florian Weimer , libc-alpha@sourceware.org References: From: Siddhesh Poyarekar In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3038.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Aug 2022 12:23:39 -0000 On 2022-08-10 05:31, Florian Weimer via Libc-alpha wrote: > 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. > --- > resolv/nss_dns/dns-host.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) LGTM. Reviewed-by: Siddhesh Poyarekar > > diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c > index 0e7eef6889..809a269a7c 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)