From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 25C143857363; Fri, 5 Aug 2022 19:34:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 25C143857363 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: make l_addr a capability X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 091bcf0e1cb51aa906ba94dc7c2abe4346ec9c5b X-Git-Newrev: a4f02d3f689e7ef8de6efb396ada210519ab315e Message-Id: <20220805193409.25C143857363@sourceware.org> Date: Fri, 5 Aug 2022 19:34:09 +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:09 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a4f02d3f689e7ef8de6efb396ada210519ab315e commit a4f02d3f689e7ef8de6efb396ada210519ab315e Author: Szabolcs Nagy Date: Fri Jun 11 08:24:29 2021 +0100 cheri: elf: make l_addr a capability l_addr should be a capability on Morello. This is synchronized with the same variable in gdb. Use elfptr_t when ElfW(Addr) represents a runtime pointer that may be dereferenced. Diff: --- elf/link.h | 6 ++++++ include/link.h | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/elf/link.h b/elf/link.h index 88b1ad7fd0..c0f255ae18 100644 --- a/elf/link.h +++ b/elf/link.h @@ -34,6 +34,12 @@ #include /* Defines __ELF_NATIVE_CLASS. */ #include +#ifdef __CHERI_PURE_CAPABILITY__ +typedef uintptr_t elfptr_t; +#else +typedef ElfW(Addr) elfptr_t; +#endif + /* The legacy rendezvous structure used by the run-time dynamic linker to communicate details of shared object loading to the debugger. */ diff --git a/include/link.h b/include/link.h index 0ac82d7c77..a3e4a7fc70 100644 --- a/include/link.h +++ b/include/link.h @@ -83,6 +83,7 @@ struct r_search_path_struct extern struct r_search_path_struct __rtld_search_dirs attribute_hidden; extern struct r_search_path_struct __rtld_env_path_list attribute_hidden; + /* Structure describing a loaded shared object. The `l_next' and `l_prev' members form a chain of all the shared objects loaded at startup. @@ -96,9 +97,9 @@ struct link_map { /* These first few members are part of the protocol with the debugger. This is the same format used in SVR4. */ - - ElfW(Addr) l_addr; /* Difference between the address in the ELF + elfptr_t l_addr; /* Difference between the address in the ELF file and the addresses in memory. */ + char *l_name; /* Absolute file name object was found in. */ ElfW(Dyn) *l_ld; /* Dynamic section of the shared object. */ struct link_map *l_next, *l_prev; /* Chain of loaded objects. */