From bb63f941fdb6537d626b30dd1dcc9e44cbbf5c90 Mon Sep 17 00:00:00 2001 From: buque Date: Fri, 23 Sep 2022 14:36:44 +0800 Subject: [PATCH] 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. --- ...-interfaces-in-gconv_parseconfdir-bu.patch | 70 +++++++++++++++++++ glibc.spec | 6 +- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 0001-gconv-Use-64-bit-interfaces-in-gconv_parseconfdir-bu.patch diff --git a/0001-gconv-Use-64-bit-interfaces-in-gconv_parseconfdir-bu.patch b/0001-gconv-Use-64-bit-interfaces-in-gconv_parseconfdir-bu.patch new file mode 100644 index 0000000..cdd9b8a --- /dev/null +++ b/0001-gconv-Use-64-bit-interfaces-in-gconv_parseconfdir-bu.patch @@ -0,0 +1,70 @@ +From 52c037f3574eb9062b111d78a4cbeb79681d07d3 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Tue, 20 Sep 2022 12:12:43 +0200 +Subject: [PATCH] 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 +(cherry picked from commit f97905f24631097af325d6a231093071c3077a5f) +Signed-off-by: buque +--- + iconv/gconv_parseconfdir.h | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + + +diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h +index debb96b322..b72933b526 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); +-- +2.37.3.windows.1 + diff --git a/glibc.spec b/glibc.spec index 003b308..16f0030 100644 --- a/glibc.spec +++ b/glibc.spec @@ -65,7 +65,7 @@ ############################################################################## Name: glibc Version: 2.36 -Release: 8 +Release: 9 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -89,6 +89,7 @@ Patch2: linux-Fix-sys-mount.h-usage-with-kernel-headers.patch Patch3: Linux-Fix-enum-fsconfig_command-detection-in-sys-mou.patch Patch4: syslog-Fix-large-messages-BZ-29536.patch Patch5: Linux-Do-not-skip-d_ino-0-entries-in-readdir-readdir.patch +Patch6: 0001-gconv-Use-64-bit-interfaces-in-gconv_parseconfdir-bu.patch Patch9000: turn-default-value-of-x86_rep_stosb_threshold_form_2K_to_1M.patch Patch9001: locale-delete-no-hard-link-to-avoid-all_language-pac.patch @@ -1264,6 +1265,9 @@ fi %endif %changelog +* Fri Sep 23 2022 Xu Wu - 2.36-9 +- gconv: Use 64-bit interfaces in gconv_parseconfdir (bug 29583) + * Tue Sep 20 2022 SuperHugePan - 2.36-8 - linux: Do not skip d_ino==0 entries in readdir, readdir64(bug 12165)