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] aarch64: morello: Add elf_machine_rtld_base_setup Date: Wed, 12 Oct 2022 14:17:21 +0000 (GMT) [thread overview] Message-ID: <20221012141721.70C603856089@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=74085ebc1f762c9fd70af4b99b5615dc5358dee0 commit 74085ebc1f762c9fd70af4b99b5615dc5358dee0 Author: Szabolcs Nagy <szabolcs.nagy@arm.com> Date: Mon Aug 8 11:29:21 2022 +0100 aarch64: morello: Add elf_machine_rtld_base_setup Use a new hook to do the rtld bootstrap map base address and root capability setup on CHERI. This will be needed to use separate per module RX and RW root caps. Diff: --- sysdeps/aarch64/morello/dl-machine.h | 72 ++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/sysdeps/aarch64/morello/dl-machine.h b/sysdeps/aarch64/morello/dl-machine.h index 19110d75c5..ff5169d779 100644 --- a/sysdeps/aarch64/morello/dl-machine.h +++ b/sysdeps/aarch64/morello/dl-machine.h @@ -101,6 +101,78 @@ elf_machine_runtime_dynamic (void) return p; } +/* PCC relative access to ehdr before relocations are processed. */ +static const ElfW(Ehdr) * +elf_machine_ehdr (void) +{ + const void *p; + asm ("" + ".weak __ehdr_start\n" + ".hidden __ehdr_start\n" + "adrp %0, __ehdr_start\n" + "add %0, %0, :lo12:__ehdr_start\n" : "=r"(p)); + return p; +} + +/* Set up ld.so root capabilities and base address from args. */ +static void __attribute__ ((unused)) +elf_machine_rtld_base_setup (struct link_map *map, void *args) +{ + uintptr_t *sp; + long argc; + uintptr_t cap_rx, cap_rw, cap_exe_rx, cap_exe_rw; + unsigned long ldso_base = 0; + + sp = args; + argc = sp[0]; + /* Skip argv. */ + sp += argc + 2; + /* Skip environ. */ + for (; *sp; sp++); + sp++; + cap_rx = cap_rw = cap_exe_rx = cap_exe_rw = 0; + for (; *sp != AT_NULL; sp += 2) + { + long t = sp[0]; + if (t == AT_BASE) + ldso_base = sp[1]; + if (t == AT_CHERI_INTERP_RX_CAP) + cap_rx = sp[1]; + if (t == AT_CHERI_INTERP_RW_CAP) + cap_rw = sp[1]; + if (t == AT_CHERI_EXEC_RX_CAP) + cap_exe_rx = sp[1]; + if (t == AT_CHERI_EXEC_RW_CAP) + cap_exe_rw = sp[1]; + } + /* Check if ldso is the executable. */ + if (ldso_base == 0) + { + cap_rx = cap_exe_rx; + cap_rw = cap_exe_rw; + ldso_base = cap_rx; /* Assume load segments start at vaddr 0. */ + } + map->l_addr = ldso_base; + map->l_map_start = cap_rx; + map->l_rw_start = cap_rw; + + /* Set up the RW ranges of ld.so, required for symbolic relocations. */ + const ElfW(Ehdr) *ehdr = elf_machine_ehdr (); + const ElfW(Phdr) *phdr = (const void *) ehdr + ehdr->e_phoff; + if (sizeof *phdr != ehdr->e_phentsize) + __builtin_trap (); + for (const ElfW(Phdr) *ph = phdr; ph < phdr + ehdr->e_phnum; ph++) + if (ph->p_type == PT_LOAD && (ph->p_flags & PF_W)) + { + uintptr_t allocend = map->l_addr + ph->p_vaddr + ph->p_memsz; + if (map->l_rw_count >= DL_MAX_RW_COUNT) + __builtin_trap (); + map->l_rw_range[map->l_rw_count].start = map->l_addr + ph->p_vaddr; + map->l_rw_range[map->l_rw_count].end = allocend; + map->l_rw_count++; + } +} + /* Load address of the dynamic linker with correct bounds. */ static uintptr_t __attribute__ ((unused)) elf_machine_load_address_from_args (void *arg)
reply other threads:[~2022-10-12 14:17 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20221012141721.70C603856089@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: linkBe 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).