From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 05A603858C52; Wed, 21 Sep 2022 11:37:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 05A603858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1663760271; bh=JFgTrlM7LUS760Ggg7k3aFNChHhpODns3tsK/HuDqvM=; h=From:To:Subject:Date:From; b=h90oIPISJ8MUFG+IkwkwNvq+5itKlzUHsLo1ex30emZw+T+FTHTyiCgo2zcaptwnD KQblFr6ooOaEyhIHhMqdk9kiU0fuqTrWqsnFcKBz6Bli68HM1/H6FYLSAoFL7sqWNW AkywuYtz5XrT8zCsW/2Kr8kZA2F70W4/0OLur+Lk= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] gconv: Use 64-bit interfaces in gconv_parseconfdir (bug 29583) X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: 2ff6775ad341b10a08e3b27d6e1df1da637747c7 X-Git-Newrev: f50a6c843a5b5186c0aa73747de033e08ef8246d Message-Id: <20220921113751.05A603858C52@sourceware.org> Date: Wed, 21 Sep 2022 11:37:51 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f50a6c843a5b5186c0aa73747de033e08ef8246d commit f50a6c843a5b5186c0aa73747de033e08ef8246d Author: Florian Weimer 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 (cherry picked from commit f97905f24631097af325d6a231093071c3077a5f) Diff: --- NEWS | 1 + iconv/gconv_parseconfdir.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 4a2531aa97..1eaa415d54 100644 --- a/NEWS +++ b/NEWS @@ -117,6 +117,7 @@ The following bugs are resolved with this release: [29446] _dlopen now ignores dl_caller argument in static mode [29490] alpha: New __brk_call implementation is broken [29528] elf: Call __libc_early_init for reused namespaces + [29583] Use 64-bit interfaces in gconv_parseconfdir Version 2.34 diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h index 79398a980c..741cf7c67e 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);