From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 52D813851511; Thu, 27 Oct 2022 13:55:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 52D813851511 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666878920; bh=ePjLoDI8Eklz3LauYEDwA5i4VWsvP3a7sCDjKCJxuF4=; h=From:To:Subject:Date:From; b=BRqBvGXjDOsnql85Pu/ia0UHNmTLaLIUr1HDUgvBcKaqlnsZIo8xj37s9rF1rVTZK HuzsBVbXzuMvB3SKDSQg33F1hb9rrZ3jaw3JT8ICvWmsqy15TxeFsg8z7x0xFeQbUh Dzqwl67QLk4uSq3BSQlog3uKfzNpTRBgwxwqU/mg= 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: add dl_{rx, rw}_ptr to derive addresses within a map X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: c511eea647f5f4ccf65a817da746bb10f4bbc2cf X-Git-Newrev: 016d45e980870f4a158e18c8e3fbf7d5e46e7f24 Message-Id: <20221027135520.52D813851511@sourceware.org> Date: Thu, 27 Oct 2022 13:55:20 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=016d45e980870f4a158e18c8e3fbf7d5e46e7f24 commit 016d45e980870f4a158e18c8e3fbf7d5e46e7f24 Author: Szabolcs Nagy Date: Mon Aug 8 10:56:14 2022 +0100 cheri: elf: add dl_{rx,rw}_ptr to derive addresses within a map To derive pointers within a module from the per module RX and RW caps. Diff: --- sysdeps/generic/ldsodefs.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 6b256b8388..f8cd388e62 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -80,6 +80,34 @@ dl_relocate_ld (const struct link_map *l) return !(l->l_ld_readonly || DL_RO_DYN_SECTION); } +static inline elfptr_t __attribute__ ((unused)) +dl_get_ptr (elfptr_t cap, ElfW(Addr) base, ElfW(Addr) vaddr) +{ +#ifdef __CHERI_PURE_CAPABILITY__ + return __builtin_cheri_address_set (cap, base + vaddr); +#else + return base + vaddr; +#endif +} + +static inline elfptr_t __attribute__ ((unused)) +dl_rx_ptr (const struct link_map *l, ElfW(Addr) vaddr) +{ + return dl_get_ptr (l->l_map_start, l->l_addr, vaddr); +} + +static inline elfptr_t __attribute__ ((unused)) +dl_rw_ptr (const struct link_map *l, ElfW(Addr) vaddr) +{ + elfptr_t cap; +#ifdef __CHERI_PURE_CAPABILITY__ + cap = l->l_rw_start; +#else + cap = 0; /* Avoid uninitialized warning. */ +#endif + return dl_get_ptr (cap, l->l_addr, vaddr); +} + /* All references to the value of l_info[DT_PLTGOT], l_info[DT_STRTAB], l_info[DT_SYMTAB], l_info[DT_RELA], l_info[DT_REL], l_info[DT_JMPREL], and l_info[VERSYMIDX (DT_VERSYM)]