From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 2EA7D3853541; Wed, 26 Oct 2022 14:49:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2EA7D3853541 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666795779; bh=AfJHakk4FcTyU9yxjZ2u0ynYjwZnyuaJuDptsu0ox24=; h=From:To:Subject:Date:From; b=Yo3FIL+POgrsT1DSlMVWWYrrByTa0W1GL/VKNpJFeHYtAGXCQ6vs/ssc4lowIEnb9 SZlzflAzosejqTthcgh2i5PWDsh0Vop5v07HffUXjeYsVecpCnXOkUIsldjRjHoHz7 HdcKjS5LrIuzQ5Bj0mccM1I8S6AZFcbjsoQQ709w= 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] TODO: more l_addr cleanup X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: e8d0e61aa2392f852c02725eb9af9b2f4139d076 X-Git-Newrev: 45b4ae2ffd243ce637fe82c912c0e863b9c660ab Message-Id: <20221026144939.2EA7D3853541@sourceware.org> Date: Wed, 26 Oct 2022 14:49:39 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=45b4ae2ffd243ce637fe82c912c0e863b9c660ab commit 45b4ae2ffd243ce637fe82c912c0e863b9c660ab Author: Szabolcs Nagy Date: Fri Oct 21 15:51:49 2022 +0100 TODO: more l_addr cleanup TODO: squash into commit f2f4f441fbda6080d0ff742f3bb535c09315ef98 cheri: elf: Turn l_addr back to ElfW(Addr) Diff: --- elf/dl-reloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index d0d9a51716..4656015ea2 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -355,7 +355,7 @@ _dl_protect_relro (struct link_map *l) { elfptr_t start = ALIGN_DOWN(dl_rx_ptr (l, l->l_relro_addr), GLRO(dl_pagesize)); - elfptr_t end = ALIGN_DOWN((l->l_addr + ElfW(Addr) end = ALIGN_DOWN((l->l_addr + l->l_relro_addr + l->l_relro_size), GLRO(dl_pagesize));