From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 9B9E3387689A; Wed, 26 Oct 2022 15:19:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B9E3387689A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666797599; bh=pgS/4EPUB+gr/w0lPsRZPsHa0/sMVMa85XibTIcy/SA=; h=From:To:Subject:Date:From; b=HognWqXaZoYlhO4lGGTqi+vwMrF7L0s1bEe/bHO6a6x+GS9BXbiv4T+I+tLraUNi2 iaY4YSiysmAhjHsp7H6SCYbcNnR5dclhPWZMxqXMEk7GeTD0cYDYd4JWkVZOZ23GnS xL6REH/Ol1NQ++wp2OzA7lTylJHCd/p3e2TZEeCs= 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: Use elfptr_t for function symbol fixup X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 7ff8b55e3030d555e0bf7bcf82a0fddeae2e1e67 X-Git-Newrev: 1bbd148f243555671e75d6cb5ea4ca5cff38efec Message-Id: <20221026151959.9B9E3387689A@sourceware.org> Date: Wed, 26 Oct 2022 15:19:59 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1bbd148f243555671e75d6cb5ea4ca5cff38efec commit 1bbd148f243555671e75d6cb5ea4ca5cff38efec Author: Szabolcs Nagy Date: Thu Oct 20 17:27:04 2022 +0100 cheri: elf: Use elfptr_t for function symbol fixup Propagate capabilities during lazy binding and IFUNC fixup in dlsym. Diff: --- elf/dl-sym-post.h | 2 +- sysdeps/generic/dl-lookupcfg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/elf/dl-sym-post.h b/elf/dl-sym-post.h index 28ca1cad7e..7c8b9b6e77 100644 --- a/elf/dl-sym-post.h +++ b/elf/dl-sym-post.h @@ -41,7 +41,7 @@ _dl_sym_post (lookup_t result, const ElfW(Sym) *ref, void *value, if (__glibc_unlikely (ELFW(ST_TYPE) (ref->st_info) == STT_GNU_IFUNC)) { DL_FIXUP_VALUE_TYPE fixup - = DL_FIXUP_MAKE_VALUE (result, (ElfW(Addr)) value); + = DL_FIXUP_MAKE_VALUE (result, (elfptr_t) value); fixup = elf_ifunc_invoke (DL_FIXUP_VALUE_ADDR (fixup)); value = (void *) DL_FIXUP_VALUE_CODE_ADDR (fixup); } diff --git a/sysdeps/generic/dl-lookupcfg.h b/sysdeps/generic/dl-lookupcfg.h index 95bcfc1cc1..149945614b 100644 --- a/sysdeps/generic/dl-lookupcfg.h +++ b/sysdeps/generic/dl-lookupcfg.h @@ -17,7 +17,7 @@ . */ /* The type of the return value of fixup/profile_fixup. */ -#define DL_FIXUP_VALUE_TYPE ElfW(Addr) +#define DL_FIXUP_VALUE_TYPE elfptr_t /* Construct a value of type DL_FIXUP_VALUE_TYPE from a code address and a link map. */ #define DL_FIXUP_MAKE_VALUE(map, addr) (addr)