diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2023-12-27 17:17:11 +0000 |
|---|---|---|
| committer | Yury Khrustalev <yury.khrustalev@arm.com> | 2024-10-14 13:16:03 +0100 |
| commit | d21abb82befc78bfb8200eff0d3144effcf4afba (patch) | |
| tree | 7994ba6ec3dd0ec8116029ba42c06213d6c5ae3f | |
| parent | f5d24d883aa2272b608b309eb7192389e7121214 (diff) | |
| download | glibc-d21abb82befc78bfb8200eff0d3144effcf4afba.tar.gz glibc-d21abb82befc78bfb8200eff0d3144effcf4afba.tar.xz glibc-d21abb82befc78bfb8200eff0d3144effcf4afba.zip | |
aarch64: Process gnu properties in static exe
Unlike for BTI, the kernel does not process GCS properties so update GL(dl_aarch64_gcs) before the GCS status is set.
| -rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/libc-start.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc-start.h b/sysdeps/unix/sysv/linux/aarch64/libc-start.h index 0dd102c374..1cc4dab818 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc-start.h +++ b/sysdeps/unix/sysv/linux/aarch64/libc-start.h @@ -21,6 +21,8 @@ #ifndef SHARED +# include <dl-prop.h> + # ifndef PR_SET_SHADOW_STACK_STATUS # define PR_GET_SHADOW_STACK_STATUS 74 # define PR_SET_SHADOW_STACK_STATUS 75 @@ -36,6 +38,16 @@ aarch64_libc_setup_tls (void) { __libc_setup_tls (); + struct link_map *main_map = _dl_get_dl_main_map (); + const ElfW(Phdr) *phdr = GL(dl_phdr); + const ElfW(Phdr) *ph; + for (ph = phdr; ph < phdr + GL(dl_phnum); ph++) + if (ph->p_type == PT_GNU_PROPERTY) + { + _dl_process_pt_gnu_property (main_map, -1, ph); + _rtld_main_check (main_map, _dl_argv[0]); + break; + } uint64_t s = GL(dl_aarch64_gcs); if (s != 0) INLINE_SYSCALL_CALL (prctl, PR_SET_SHADOW_STACK_STATUS, s, 0, 0, 0); |