forked from rpms/glibc
e43852d149
* Thu Oct 13 2022 Arjun Shankar <arjun@redhat.com> - 2.34-48 - Handle non-hostname CNAME aliases during name resolution (#2129005) - Sync with upstream branch release/2.34/master, commit e3976287b22422787f3cc6fc9adda58304b55bd9: - nscd: Drop local address tuple variable [BZ #29607] - x86-64: Require BMI1/BMI2 for AVX2 strrchr and wcsrchr implementations - x86-64: Require BMI2 and LZCNT for AVX2 memrchr implementation - x86-64: Require BMI2 for AVX2 (raw|w)memchr implementations - x86-64: Require BMI2 for AVX2 wcs(n)cmp implementations - x86-64: Require BMI2 for AVX2 strncmp implementation - x86-64: Require BMI2 for AVX2 strcmp implementation - x86-64: Require BMI2 for AVX2 str(n)casecmp implementations - x86: include BMI1 and BMI2 in x86-64-v3 level - nptl: Add backoff mechanism to spinlock loop - sysdeps: Add 'get_fast_jitter' interace in fast-jitter.h - nptl: Effectively skip CAS in spinlock loop - Move assignment out of the CAS condition - Add LLL_MUTEX_READ_LOCK [BZ #28537] - Avoid extra load with CAS in __pthread_mutex_clocklock_common [BZ #28537] - Avoid extra load with CAS in __pthread_mutex_lock_full [BZ #28537] - resolv: Fix building tst-resolv-invalid-cname for earlier C standards - nss_dns: Rewrite _nss_dns_gethostbyname4_r using current interfaces - resolv: Add new tst-resolv-invalid-cname - nss_dns: In gaih_getanswer_slice, skip strange aliases (bug 12154) (#2129005) - nss_dns: Rewrite getanswer_r to match getanswer_ptr (bug 12154, bug 29305) - nss_dns: Remove remnants of IPv6 address mapping - nss_dns: Rewrite _nss_dns_gethostbyaddr2_r and getanswer_ptr - nss_dns: Split getanswer_ptr from getanswer_r - resolv: Add DNS packet parsing helpers geared towards wire format - resolv: Add internal __ns_name_length_uncompressed function - resolv: Add the __ns_samebinaryname function - resolv: Add internal __res_binary_hnok function - resolv: Add tst-resolv-aliases - resolv: Add tst-resolv-byaddr for testing reverse lookup - gconv: Use 64-bit interfaces in gconv_parseconfdir (bug 29583) - elf: Fix hwcaps string size overestimation - nscd: Fix netlink cache invalidation if epoll is used [BZ #29415] - Apply asm redirections in wchar.h before first use - Apply asm redirections in stdio.h before first use [BZ #27087] - elf: Call __libc_early_init for reused namespaces (bug 29528) Resolves: #2129005 Resolves: #2116960
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
commit c36e7cca3571b0c92b09409c1df86a142596c210
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
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 <siddhesh@sourceware.org>
|
|
(cherry picked from commit 32b599ac8c21c4c332cc3900a792a1395bca79c7)
|
|
|
|
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
|
|
index 10c21e1e827cde12..1cb3be71f04d98eb 100644
|
|
--- a/resolv/nss_dns/dns-host.c
|
|
+++ b/resolv/nss_dns/dns-host.c
|
|
@@ -971,12 +971,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;
|
|
@@ -1022,14 +1022,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)
|