From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 777383857BAA; Fri, 5 Aug 2022 19:34:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 777383857BAA 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 in _dl_protect_relro X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: d63bc8be874f42090f3a7a51441221863b83f149 X-Git-Newrev: 7880bbd37436b0acd01936b7ba143d1f13634e85 Message-Id: <20220805193434.777383857BAA@sourceware.org> Date: Fri, 5 Aug 2022 19:34:34 +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:34 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7880bbd37436b0acd01936b7ba143d1f13634e85 commit 7880bbd37436b0acd01936b7ba143d1f13634e85 Author: Szabolcs Nagy Date: Mon Jun 21 10:51:05 2021 +0100 cheri: elf: Use elfptr_t in _dl_protect_relro start/end should be capabilities now that l_addr is a capability. Diff: --- elf/dl-reloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 756bf950f6..abc72472ba 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -353,10 +353,10 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], void _dl_protect_relro (struct link_map *l) { - ElfW(Addr) start = ALIGN_DOWN((l->l_addr + elfptr_t start = ALIGN_DOWN((l->l_addr + l->l_relro_addr), GLRO(dl_pagesize)); - ElfW(Addr) end = ALIGN_DOWN((l->l_addr + elfptr_t end = ALIGN_DOWN((l->l_addr + l->l_relro_addr + l->l_relro_size), GLRO(dl_pagesize));