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
63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
commit f50a6c843a5b5186c0aa73747de033e08ef8246d
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Tue Sep 20 12:12:43 2022 +0200
|
|
|
|
gconv: Use 64-bit interfaces in gconv_parseconfdir (bug 29583)
|
|
|
|
It's possible that inode numbers are outside the 32-bit range.
|
|
The existing code only handles the in-libc case correctly, and
|
|
still uses the legacy interfaces when building iconv.
|
|
|
|
Suggested-by: Helge Deller <deller@gmx.de>
|
|
(cherry picked from commit f97905f24631097af325d6a231093071c3077a5f)
|
|
|
|
diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
|
|
index 79398a980cde84e3..741cf7c67e36eccd 100644
|
|
--- a/iconv/gconv_parseconfdir.h
|
|
+++ b/iconv/gconv_parseconfdir.h
|
|
@@ -29,14 +29,14 @@
|
|
# define isspace(__c) __isspace_l ((__c), _nl_C_locobj_ptr)
|
|
# define asprintf __asprintf
|
|
# define opendir __opendir
|
|
-# define readdir __readdir
|
|
+# define readdir64 __readdir64
|
|
# define closedir __closedir
|
|
# define mempcpy __mempcpy
|
|
-# define struct_stat struct __stat64_t64
|
|
-# define lstat __lstat64_time64
|
|
+# define struct_stat64 struct __stat64_t64
|
|
+# define lstat64 __lstat64_time64
|
|
# define feof_unlocked __feof_unlocked
|
|
#else
|
|
-# define struct_stat struct stat
|
|
+# define struct_stat64 struct stat64
|
|
#endif
|
|
|
|
/* Name of the file containing the module information in the directories
|
|
@@ -148,8 +148,8 @@ gconv_parseconfdir (const char *prefix, const char *dir, size_t dir_len)
|
|
DIR *confdir = opendir (buf);
|
|
if (confdir != NULL)
|
|
{
|
|
- struct dirent *ent;
|
|
- while ((ent = readdir (confdir)) != NULL)
|
|
+ struct dirent64 *ent;
|
|
+ while ((ent = readdir64 (confdir)) != NULL)
|
|
{
|
|
if (ent->d_type != DT_REG && ent->d_type != DT_UNKNOWN)
|
|
continue;
|
|
@@ -161,12 +161,12 @@ gconv_parseconfdir (const char *prefix, const char *dir, size_t dir_len)
|
|
&& strcmp (ent->d_name + len - strlen (suffix), suffix) == 0)
|
|
{
|
|
char *conf;
|
|
- struct_stat st;
|
|
+ struct_stat64 st;
|
|
if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0)
|
|
continue;
|
|
|
|
if (ent->d_type != DT_UNKNOWN
|
|
- || (lstat (conf, &st) != -1 && S_ISREG (st.st_mode)))
|
|
+ || (lstat64 (conf, &st) != -1 && S_ISREG (st.st_mode)))
|
|
found |= read_conf_file (conf, dir, dir_len);
|
|
|
|
free (conf);
|