From: Siddhesh Poyarekar <siddhesh@gotplt.org>
To: Florian Weimer <fweimer@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 11/13] nss_dns: In gaih_getanswer_slice, skip strange aliases (bug 12154)
Date: Tue, 23 Aug 2022 08:23:28 -0400 [thread overview]
Message-ID: <b5d5bc52-a5ff-2dbe-c20c-ba6073fbc364@gotplt.org> (raw)
In-Reply-To: <a2475d6fc9cbc351e19556068dbfe90369b0d3f8.1660123636.git.fweimer@redhat.com>
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 <siddhesh@sourceware.org>
>
> 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)
next prev parent reply other threads:[~2022-08-23 12:23 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-10 9:30 [PATCH 00/13] nss_dns: Fix handling of non-host CNAMEs " Florian Weimer
2022-08-10 9:30 ` [PATCH 01/13] resolv: Add tst-resolv-byaddr for testing reverse lookup Florian Weimer
2022-08-18 15:26 ` Siddhesh Poyarekar
2022-08-10 9:30 ` [PATCH 02/13] resolv: Add tst-resolv-aliases Florian Weimer
2022-08-18 16:36 ` Siddhesh Poyarekar
2022-08-19 14:20 ` Florian Weimer
2022-08-19 14:27 ` Siddhesh Poyarekar
2022-08-19 14:54 ` Florian Weimer
2022-08-24 13:30 ` Florian Weimer
2022-08-10 9:30 ` [PATCH 03/13] resolv: Add internal __res_binary_hnok function Florian Weimer
2022-08-18 16:40 ` Siddhesh Poyarekar
2022-08-10 9:30 ` [PATCH 04/13] resolv: Add the __ns_samebinaryname function Florian Weimer
2022-08-18 16:46 ` Siddhesh Poyarekar
2022-08-10 9:30 ` [PATCH 05/13] resolv: Add internal __ns_name_length_uncompressed function Florian Weimer
2022-08-18 17:23 ` Siddhesh Poyarekar
2022-08-10 9:30 ` [PATCH 06/13] resolv: Add DNS packet parsing helpers geared towards wire format Florian Weimer
2022-08-18 18:57 ` Siddhesh Poyarekar
2022-08-19 14:59 ` Florian Weimer
2022-08-19 15:13 ` Siddhesh Poyarekar
2022-08-22 15:59 ` Siddhesh Poyarekar
2022-08-10 9:30 ` [PATCH 07/13] nss_dns: Split getanswer_ptr from getanswer_r Florian Weimer
2022-08-22 16:18 ` Siddhesh Poyarekar
2022-08-10 9:30 ` [PATCH 08/13] nss_dns: Rewrite _nss_dns_gethostbyaddr2_r and getanswer_ptr Florian Weimer
2022-08-22 21:59 ` Siddhesh Poyarekar
2022-08-10 9:30 ` [PATCH 09/13] nss_dns: Remove remnants of IPv6 address mapping Florian Weimer
2022-08-22 22:05 ` Siddhesh Poyarekar
2022-08-10 9:30 ` [PATCH 10/13] nss_dns: Rewrite getanswer_r to match getanswer_ptr (bug 12154, bug 29305) Florian Weimer
2022-08-22 22:20 ` Siddhesh Poyarekar
2022-08-10 9:31 ` [PATCH 11/13] nss_dns: In gaih_getanswer_slice, skip strange aliases (bug 12154) Florian Weimer
2022-08-23 12:23 ` Siddhesh Poyarekar [this message]
2022-08-10 9:31 ` [PATCH 12/13] resolv: Add new tst-resolv-invalid-cname Florian Weimer
2022-08-23 12:32 ` Siddhesh Poyarekar
2022-08-10 9:31 ` [PATCH 13/13] nss_dns: Rewrite _nss_dns_gethostbyname4_r using current interfaces Florian Weimer
2022-08-23 12:49 ` Siddhesh Poyarekar
2022-08-24 12:25 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b5d5bc52-a5ff-2dbe-c20c-ba6073fbc364@gotplt.org \
--to=siddhesh@gotplt.org \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).