From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 38AC23852C67; Wed, 23 Nov 2022 14:45:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 38AC23852C67 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214728; bh=DtSrTb5RL+Ty39cje1EUs31Fp5qyIBK/2EwH5dvbQwY=; h=From:To:Subject:Date:From; b=DI1eE/lc/a9BSHzMyf9+xtNkc7d6GQ+zM5eziLn9t2ReReySWxO/HCNbwRdbXlwrw F5Nqu09o2VWCD6rZHS9BSbDKDzqUtwUgrRtz39bMRKnUHISQxsynpKkfgpAPFhn4MG YNFyIJgCasWSwTH/ehmJqT/5PyqGMNbRuWXQT+eU= 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: 90c5142f771b318dc905faf02162a01b8f546460 X-Git-Newrev: a5750ba400ec9a2561ac58700fc4ee76491b3984 Message-Id: <20221123144528.38AC23852C67@sourceware.org> Date: Wed, 23 Nov 2022 14:45:28 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a5750ba400ec9a2561ac58700fc4ee76491b3984 commit a5750ba400ec9a2561ac58700fc4ee76491b3984 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) and the pointers are derived from the RX pointer of the elf module. Diff: --- csu/libc-start.c | 6 +++--- elf/dl-close.c | 10 ++++------ elf/dl-fini.c | 9 ++++----- elf/dl-init.c | 15 ++++++++------- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/csu/libc-start.c b/csu/libc-start.c index 09235865bd..d71fbec3fe 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -132,15 +132,15 @@ call_init (int argc, char **argv, char **env) the same file. */ if (ELF_INITFINI && l->l_info[DT_INIT] != NULL) - DL_CALL_DT_INIT(l, l->l_addr + l->l_info[DT_INIT]->d_un.d_ptr, + DL_CALL_DT_INIT(l, dl_rx_ptr (l, l->l_info[DT_INIT]->d_un.d_ptr), argc, argv, env); ElfW(Dyn) *init_array = l->l_info[DT_INIT_ARRAY]; 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 *) dl_rx_ptr (l, init_array->d_un.d_ptr); 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..5a45062f09 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -119,11 +119,10 @@ call_destructors (void *closure) if (map->l_info[DT_FINI_ARRAY] != NULL) { - ElfW(Addr) *array = - (ElfW(Addr) *) (map->l_addr - + map->l_info[DT_FINI_ARRAY]->d_un.d_ptr); + elfptr_t *array = + (elfptr_t *) dl_rx_ptr (map, 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]) (); @@ -131,8 +130,7 @@ call_destructors (void *closure) /* Next try the old-style destructor. */ if (map->l_info[DT_FINI] != NULL) - DL_CALL_DT_FINI (map, ((void *) map->l_addr - + map->l_info[DT_FINI]->d_un.d_ptr)); + DL_CALL_DT_FINI (map, dl_rx_ptr (map, map->l_info[DT_FINI]->d_un.d_ptr)); } void diff --git a/elf/dl-fini.c b/elf/dl-fini.c index 030b1fcbcd..18135b2191 100644 --- a/elf/dl-fini.c +++ b/elf/dl-fini.c @@ -133,11 +133,10 @@ _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 - + l->l_info[DT_FINI_ARRAY]->d_un.d_ptr); + ElfW(Addr) v = l->l_info[DT_FINI_ARRAY]->d_un.d_ptr; + elfptr_t *array = (elfptr_t *) dl_rx_ptr (l, v); 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]) (); } @@ -145,7 +144,7 @@ _dl_fini (void) /* Next try the old-style destructor. */ if (ELF_INITFINI && l->l_info[DT_FINI] != NULL) DL_CALL_DT_FINI - (l, l->l_addr + l->l_info[DT_FINI]->d_un.d_ptr); + (l, dl_rx_ptr (l, l->l_info[DT_FINI]->d_un.d_ptr)); } #ifdef SHARED diff --git a/elf/dl-init.c b/elf/dl-init.c index deefeb099a..7fb2af6a3f 100644 --- a/elf/dl-init.c +++ b/elf/dl-init.c @@ -53,7 +53,8 @@ call_init (struct link_map *l, int argc, char **argv, char **env) - the others in the DT_INIT_ARRAY. */ if (ELF_INITFINI && l->l_info[DT_INIT] != NULL) - DL_CALL_DT_INIT(l, l->l_addr + l->l_info[DT_INIT]->d_un.d_ptr, argc, argv, env); + DL_CALL_DT_INIT(l, dl_rx_ptr (l, l->l_info[DT_INIT]->d_un.d_ptr), + argc, argv, env); /* Next see whether there is an array with initialization functions. */ ElfW(Dyn) *init_array = l->l_info[DT_INIT_ARRAY]; @@ -61,11 +62,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 *) dl_rx_ptr (l, init_array->d_un.d_ptr); for (j = 0; j < jm; ++j) ((dl_init_t) addrs[j]) (argc, argv, env); } @@ -88,16 +89,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 *) dl_rx_ptr (main_map, preinit_array->d_un.d_ptr); for (cnt = 0; cnt < i; ++cnt) ((dl_init_t) addrs[cnt]) (argc, argv, env); }