diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-09-07 10:38:29 +0100 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-10-27 14:46:52 +0100 |
| commit | be30cd722b60dedd532e7a0e73c3ef377cd263d6 (patch) | |
| tree | 43036799505f5738a72443eed12e7bc8b3241a88 /sysdeps/unix/sysv | |
| parent | 016d45e980870f4a158e18c8e3fbf7d5e46e7f24 (diff) | |
| download | glibc-be30cd722b60dedd532e7a0e73c3ef377cd263d6.tar glibc-be30cd722b60dedd532e7a0e73c3ef377cd263d6.tar.gz glibc-be30cd722b60dedd532e7a0e73c3ef377cd263d6.tar.bz2 glibc-be30cd722b60dedd532e7a0e73c3ef377cd263d6.zip | |
cheri: Setup RX, RW capabilities for static linking
At least tls image access requires RX capability of the main link_map.
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-parse_auxv.h | 9 |
1 files changed, 7 insertions, 2 deletions
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 <ldsodefs.h> #include <link.h> -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]; |