AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

cheri: rseq: remove const to avoid readonly permission

Browse Source 
Using const on the definition does not work for a pure capability ABI:
the capability permissions when accessing the object will be read only.

Use a hack to hide the public declaration in the TU where the const
objects are initialized. (This should work on non-capability targets
too, but to err on the safe side only enable the hack on capability
targets.)
This commit is contained in:
Szabolcs Nagy 2022-03-01 09:44:14 +00:00
parent 01faa1bcd4
commit 5778537ccd
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sysdeps/nptl/dl-tls_init_tp.c
View File

@ -16,6 +16,15 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#ifdef __CHERI_PURE_CAPABILITY__
/* This hack ensures that the later indirectly included public const
declaration does not conflict with the non-const definition here. */
# define __rseq_size __rseq_size_public_const
# define __rseq_offset __rseq_offset_public_const
# include <sys/rseq.h>
# undef __rseq_size
# undef __rseq_offset
#endif
#include <kernel-features.h>
#include <ldsodefs.h>
#include <list.h>
@ -45,8 +54,13 @@ rtld_mutex_dummy (pthread_mutex_t *lock)
#endif
const unsigned int __rseq_flags;
#ifdef __CHERI_PURE_CAPABILITY__
unsigned int __rseq_size attribute_relro;
ptrdiff_t __rseq_offset attribute_relro;
#else
const unsigned int __rseq_size attribute_relro;
const ptrdiff_t __rseq_offset attribute_relro;
#endif
void
__tls_pre_init_tp (void)