public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/arm/morello/main] cheri: elf: Use elfptr_t in _dl_protect_relro
Date: Thu, 27 Oct 2022 13:55:41 +0000 (GMT)	[thread overview]
Message-ID: <20221027135542.CA886385151F@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2f3c9e7127b6fac0a712cf59b7a9a2f007bf7711

commit 2f3c9e7127b6fac0a712cf59b7a9a2f007bf7711
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
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

             reply	other threads:[~2022-10-27 13:55 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-27 13:55 Szabolcs Nagy [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-11-23 14:45 Szabolcs Nagy
2022-10-26 15:17 Szabolcs Nagy
2022-08-05 19:34 Szabolcs Nagy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221027135542.CA886385151F@sourceware.org \
    --to=nsz@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).