From be30cd722b60dedd532e7a0e73c3ef377cd263d6 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Wed, 7 Sep 2022 10:38:29 +0100 Subject: cheri: Setup RX, RW capabilities for static linking At least tls image access requires RX capability of the main link_map. --- sysdeps/unix/sysv/linux/dl-parse_auxv.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/linux/dl-parse_auxv.h b/sysdeps/unix/sysv/linux/dl-parse_auxv.h index 48ca7736a0..a0770b4412 100644 --- a/sysdeps/unix/sysv/linux/dl-parse_auxv.h +++ b/sysdeps/unix/sysv/linux/dl-parse_auxv.h @@ -22,7 +22,12 @@ #include #include -typedef elfptr_t dl_parse_auxv_t[AT_MINSIGSTKSZ + 1]; +#ifdef __CHERI_PURE_CAPABILITY__ +# define AT_MAX AT_ENVP +#else +# define AT_MAX AT_MINSIGSTKSZ +#endif +typedef elfptr_t dl_parse_auxv_t[AT_MAX + 1]; /* Copy the auxiliary vector into AUXV_VALUES and set up GLRO variables. */ @@ -39,7 +44,7 @@ void _dl_parse_auxv (ElfW(auxv_t) *av, dl_parse_auxv_t auxv_values) auxv_values[AT_MINSIGSTKSZ] = CONSTANT_MINSIGSTKSZ; for (; av->a_type != AT_NULL; av++) - if (av->a_type <= AT_MINSIGSTKSZ) + if (av->a_type <= AT_MAX) auxv_values[av->a_type] = av->a_un.a_val; GLRO(dl_pagesize) = auxv_values[AT_PAGESZ]; -- cgit v1.2.3-70-g09d2