From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id CA886385151F; Thu, 27 Oct 2022 13:55:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CA886385151F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666878942; bh=3C6P+0QeMGhDevyxVv+jIfXbGg5E5q5PccS/vwuKGT4=; h=From:To:Subject:Date:From; b=C3/nVb72oJz06y2S7LBWRcf1K/8tCvXhN/ms0VhkmajUtAS1ECei+WDrC2iAKBp/m ydXUmrRO8KgZ197WFehXGDTIna158C7eVxGlEcsLFmrkWYSNdz0H8To9urkqynDzew 0/V4d2lU2E13msyDf95QslSV9lfjD3Wquja6EHXs= 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: 3a41a4efd8a2d1cd5f95c0ec85f2f76ca97ae80a X-Git-Newrev: 2f3c9e7127b6fac0a712cf59b7a9a2f007bf7711 Message-Id: <20221027135542.CA886385151F@sourceware.org> Date: Thu, 27 Oct 2022 13:55:41 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2f3c9e7127b6fac0a712cf59b7a9a2f007bf7711 commit 2f3c9e7127b6fac0a712cf59b7a9a2f007bf7711 Author: Szabolcs Nagy Date: Mon Jun 21 10:51:05 2021 +0100 cheri: elf: Use elfptr_t in _dl_protect_relro Derive the start of the relro area from the RW capability of the dso. Diff: --- elf/dl-reloc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 756bf950f6..4656015ea2 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -353,8 +353,7 @@ _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 - + l->l_relro_addr), + elfptr_t start = ALIGN_DOWN(dl_rx_ptr (l, l->l_relro_addr), GLRO(dl_pagesize)); ElfW(Addr) end = ALIGN_DOWN((l->l_addr + l->l_relro_addr