[PATCH v8 17/20] aarch64: Process gnu properties in static exe

[Adhemerval Zanella Netto]

On 14/01/25 13:03, Yury Khrustalev wrote:
> From: Szabolcs Nagy <szabolcs.nagy@arm.com>
> 
> Unlike for BTI, the kernel does not process GCS properties so update
> GL(dl_aarch64_gcs) before the GCS status is set.

LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  sysdeps/unix/sysv/linux/aarch64/libc-start.h | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc-start.h b/sysdeps/unix/sysv/linux/aarch64/libc-start.h
> index 2ea61bf272..75ae0a884a 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_SET_SHADOW_STACK_STATUS	75
>  #  define PR_SHADOW_STACK_ENABLE	(1UL << 0)
> @@ -31,6 +33,18 @@ static inline void __attribute__((always_inline))
>  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;
> +      }
> +
>    if (GL(dl_aarch64_gcs) != 0)
>      {
>        int ret = INLINE_SYSCALL_CALL (prctl, PR_SET_SHADOW_STACK_STATUS,