From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id CF9AD383FBB4; Wed, 26 Oct 2022 15:20:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CF9AD383FBB4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666797609; bh=PCwdirKZv3BgLVrP1cXwegBuoG6pYTOlHFWmnVBcZ3k=; h=From:To:Subject:Date:From; b=xAn+iWDlJrwIpDWBJjU71zLnJH6jbAoN6bTgxIGeTTgZDP2rJZbSb6Xlnv3QjbUg3 RQr5XiAsu0zX5Ta2ShXQKD7ORs2n5x0jIviGMPgk3eT1FgdkFACFi6IoN49/mFmNuJ 8Dn80udzJliHk/JF+bNwz/bajgsttghStor4TgOg= 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: fix SYMBOL_ADDRESS to return RX derived pointer X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: c3fa4c960ae942f6fdbe59cd2006accefa06f426 X-Git-Newrev: 1807fa54edb05736b71efa964826fca288daeec9 Message-Id: <20221026152009.CF9AD383FBB4@sourceware.org> Date: Wed, 26 Oct 2022 15:20:09 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1807fa54edb05736b71efa964826fca288daeec9 commit 1807fa54edb05736b71efa964826fca288daeec9 Author: Szabolcs Nagy Date: Tue Sep 6 09:08:25 2022 +0100 cheri: elf: fix SYMBOL_ADDRESS to return RX derived pointer All symbol addresses can be derived from the RX capability of the module (l_map_start). For RW object symbols pointer will have to be rederived from l_rw_start. Diff: --- sysdeps/generic/ldsodefs.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 563b440aab..81b6356460 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -122,13 +122,16 @@ dl_rw_ptr (const struct link_map *l, ElfW(Addr) vaddr) typedef struct link_map *lookup_t; #define LOOKUP_VALUE(map) map #define LOOKUP_VALUE_ADDRESS(map, set) ((set) || (map) ? (map)->l_addr : 0) +#define LOOKUP_VALUE_START(map, set) ((set) || (map) ? (map)->l_map_start : 0) /* Calculate the address of symbol REF using the base address from map MAP, if non-NULL. Don't check for NULL map if MAP_SET is TRUE. */ #define SYMBOL_ADDRESS(map, ref, map_set) \ ((ref) == NULL ? 0 \ - : (__glibc_unlikely ((ref)->st_shndx == SHN_ABS) ? 0 \ - : LOOKUP_VALUE_ADDRESS (map, map_set)) + (ref)->st_value) + : (__glibc_unlikely ((ref)->st_shndx == SHN_ABS) ? (ref)->st_value \ + : dl_get_ptr (LOOKUP_VALUE_START (map, map_set), \ + LOOKUP_VALUE_ADDRESS (map, map_set), \ + (ref)->st_value))) /* Type of a constructor function, in DT_INIT, DT_INIT_ARRAY, DT_PREINIT_ARRAY. */