From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 5C4233852C4A; Wed, 23 Nov 2022 14:45:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5C4233852C4A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214738; bh=QFJM37bJYSWVR3I2/3KCM12a/IhpMVOpmTjoBHa7c+Y=; h=From:To:Subject:Date:From; b=OEL4H3X8P9L41TDWnwwJVVGDg1VXHmaoZb0J+uYWAf1nXFkTJrXEtVl31L7tFSzxW L4b1ODGXLoTqsG1lAUBX6LCvZkDcpuY+2uEklnK6szZynVipYshETF4FQKAs83VZp+ JzDx08MWWUKwhbTuNgDdBFig2PSPp7IqI9QUE4hU= 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: 9bf00c58bc399042c097121ea5904df3d665128b X-Git-Newrev: faee37cd4c29f5265c817b05a0103486fd02a957 Message-Id: <20221123144538.5C4233852C4A@sourceware.org> Date: Wed, 23 Nov 2022 14:45:38 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=faee37cd4c29f5265c817b05a0103486fd02a957 commit faee37cd4c29f5265c817b05a0103486fd02a957 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