From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 660833857361; Fri, 5 Aug 2022 19:34:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 660833857361 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: elf: elfptr_t fixes for preinit/init/fini array X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: d257d001c3f16ccc4e4692201d3c03f67a0a9b18 X-Git-Newrev: d63bc8be874f42090f3a7a51441221863b83f149 Message-Id: <20220805193429.660833857361@sourceware.org> Date: Fri, 5 Aug 2022 19:34:29 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 19:34:29 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d63bc8be874f42090f3a7a51441221863b83f149 commit d63bc8be874f42090f3a7a51441221863b83f149 Author: Szabolcs Nagy Date: Thu Apr 7 18:40:25 2022 +0100 cheri: elf: elfptr_t fixes for preinit/init/fini array According to the ELF spec: "Each element of this array is a pointer to a function to be executed by the dynamic linker." "Note that the address of a function need not be the same as a pointer to a function as defined by the processor supplement." so these should be accessed via uintptr_t type instead of ElfW(Addr). Diff: --- csu/libc-start.c | 4 ++-- elf/dl-close.c | 6 +++--- elf/dl-fini.c | 6 +++--- elf/dl-init.c | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/csu/libc-start.c b/csu/libc-start.c index 543560f36c..2726fbdbec 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -139,8 +139,8 @@ call_init (int argc, char **argv, char **env) if (init_array != NULL) { unsigned int jm - = l->l_info[DT_INIT_ARRAYSZ]->d_un.d_val / sizeof (ElfW(Addr)); - ElfW(Addr) *addrs = (void *) (init_array->d_un.d_ptr + l->l_addr); + = l->l_info[DT_INIT_ARRAYSZ]->d_un.d_val / sizeof (elfptr_t); + elfptr_t *addrs = (void *) (init_array->d_un.d_ptr + l->l_addr); for (unsigned int j = 0; j < jm; ++j) ((dl_init_t) addrs[j]) (argc, argv, env); } diff --git a/elf/dl-close.c b/elf/dl-close.c index bcd6e206e9..a20cf8cc36 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -119,11 +119,11 @@ call_destructors (void *closure) if (map->l_info[DT_FINI_ARRAY] != NULL) { - ElfW(Addr) *array = - (ElfW(Addr) *) (map->l_addr + elfptr_t *array = + (elfptr_t *) (map->l_addr + map->l_info[DT_FINI_ARRAY]->d_un.d_ptr); unsigned int sz = (map->l_info[DT_FINI_ARRAYSZ]->d_un.d_val - / sizeof (ElfW(Addr))); + / sizeof (elfptr_t)); while (sz-- > 0) ((fini_t) array[sz]) (); diff --git a/elf/dl-fini.c b/elf/dl-fini.c index 030b1fcbcd..040bda28b2 100644 --- a/elf/dl-fini.c +++ b/elf/dl-fini.c @@ -133,11 +133,11 @@ _dl_fini (void) /* First see whether an array is given. */ if (l->l_info[DT_FINI_ARRAY] != NULL) { - ElfW(Addr) *array = - (ElfW(Addr) *) (l->l_addr + elfptr_t *array = + (elfptr_t *) (l->l_addr + l->l_info[DT_FINI_ARRAY]->d_un.d_ptr); unsigned int i = (l->l_info[DT_FINI_ARRAYSZ]->d_un.d_val - / sizeof (ElfW(Addr))); + / sizeof (elfptr_t)); while (i-- > 0) ((fini_t) array[i]) (); } diff --git a/elf/dl-init.c b/elf/dl-init.c index deefeb099a..4c8aaae7e0 100644 --- a/elf/dl-init.c +++ b/elf/dl-init.c @@ -61,11 +61,11 @@ call_init (struct link_map *l, int argc, char **argv, char **env) { unsigned int j; unsigned int jm; - ElfW(Addr) *addrs; + elfptr_t *addrs; - jm = l->l_info[DT_INIT_ARRAYSZ]->d_un.d_val / sizeof (ElfW(Addr)); + jm = l->l_info[DT_INIT_ARRAYSZ]->d_un.d_val / sizeof (elfptr_t); - addrs = (ElfW(Addr) *) (init_array->d_un.d_ptr + l->l_addr); + addrs = (elfptr_t *) (init_array->d_un.d_ptr + l->l_addr); for (j = 0; j < jm; ++j) ((dl_init_t) addrs[j]) (argc, argv, env); } @@ -88,16 +88,16 @@ _dl_init (struct link_map *main_map, int argc, char **argv, char **env) /* Don't do anything if there is no preinit array. */ if (__builtin_expect (preinit_array != NULL, 0) && preinit_array_size != NULL - && (i = preinit_array_size->d_un.d_val / sizeof (ElfW(Addr))) > 0) + && (i = preinit_array_size->d_un.d_val / sizeof (elfptr_t)) > 0) { - ElfW(Addr) *addrs; + elfptr_t *addrs; unsigned int cnt; if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS)) _dl_debug_printf ("\ncalling preinit: %s\n\n", DSO_FILENAME (main_map->l_name)); - addrs = (ElfW(Addr) *) (preinit_array->d_un.d_ptr + main_map->l_addr); + addrs = (elfptr_t *) (preinit_array->d_un.d_ptr + main_map->l_addr); for (cnt = 0; cnt < i; ++cnt) ((dl_init_t) addrs[cnt]) (argc, argv, env); }