diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-09-06 08:40:52 +0100 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-10-12 14:22:03 +0100 |
| commit | a3085f72f8b450631ca0d9f8fe80482f079295ef (patch) | |
| tree | 350f55749c9a364048b99a66ec391d9208ecebcb /elf | |
| parent | 456f4dd6e5311b020cda926e6da4f3a820516339 (diff) | |
| download | glibc-a3085f72f8b450631ca0d9f8fe80482f079295ef.zip glibc-a3085f72f8b450631ca0d9f8fe80482f079295ef.tar.gz glibc-a3085f72f8b450631ca0d9f8fe80482f079295ef.tar.bz2 | |
cheri: elf: make l_entry a capability
Previously the entry address was fixed up to be a capability before
using it so l_entry could be ElfW(Addr), but the code is simpler and
more consistent if l_entry is a capability throughout:
The AT_ENTRY auxv entry is specified to be a capability and a number
if internal l_entry usage is simpler if it is elfptr_t.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/rtld.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -384,7 +384,7 @@ extern struct rtld_global_ro _rtld_local_ro static void dl_main (const ElfW(Phdr) *phdr, ElfW(Word) phnum, - ElfW(Addr) *user_entry, ElfW(auxv_t) *auxv); + elfptr_t *user_entry, ElfW(auxv_t) *auxv); /* These two variables cannot be moved into .data.rel.ro. */ static struct libname_list _dl_rtld_libname; @@ -453,7 +453,7 @@ static elfptr_t __attribute__ ((noinline)) _dl_start_final (void *arg, struct dl_start_final_info *info) #endif { - ElfW(Addr) start_addr; + elfptr_t start_addr; /* Do not use an initializer for these members because it would intefere with __rtld_static_init. */ @@ -1357,7 +1357,7 @@ _dl_start_args_adjust (int skip_args) static void dl_main (const ElfW(Phdr) *phdr, ElfW(Word) phnum, - ElfW(Addr) *user_entry, + elfptr_t *user_entry, ElfW(auxv_t) *auxv) { struct link_map *main_map; |