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

aarch64: morello: elf: Return bounded pointer in __tls_get_addr

Browse Source 
There is no traditional TLS support in morello that would explicitly
call __tls_get_addr, but the libc uses it internally and the returned
pointer escapes to user code.  So bound the pointers according to
the tls symbol size instead of doing so in each caller.

(Affects dlsym and dynamic TLSDESC.)
This commit is contained in:
Szabolcs Nagy 2022-09-07 14:17:46 +01:00
parent ab0bc274aa
commit f0e8f3667c
4 changed files with 69 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elf/dl-sym.c
View File

@ -49,6 +49,10 @@ _dl_tls_symaddr (struct link_map *map, const ElfW(Sym) *ref)
{
.ti_module = map->l_tls_modid,
.ti_offset = ref->st_value
# ifdef __CHERI_PURE_CAPABILITY__
,
.ti_size = ref->st_size
# endif
};
return __TLS_GET_ADDR (&tmp);

39
sysdeps/aarch64/morello/dl-tls.c Normal file
View File

@ -0,0 +1,39 @@
/* Thread-local storage handling in the ELF dynamic linker. Morello version.
Copyright (C) 2022 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#ifdef SHARED
/* Add a wrapper around the generic __tls_get_addr code to set the
bounds on the returned pointer. */
# define __tls_get_addr __tls_get_addr_unbounded
# include <elf/dl-tls.c>
# undef __tls_get_addr
void *__tls_get_addr (tls_index *ti);
rtld_hidden_proto (__tls_get_addr)
rtld_hidden_def (__tls_get_addr)
void *
__tls_get_addr (tls_index *ti)
{
void *p = __tls_get_addr_unbounded (ti);
return __builtin_cheri_bounds_set_exact (p, ti->ti_size);
}
#else
# include <elf/dl-tls.c>
#endif

26
sysdeps/aarch64/morello/dl-tls.h Normal file
View File

@ -0,0 +1,26 @@
/* Copyright (C) 2022 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
typedef struct
{
unsigned long int ti_module;
unsigned long int ti_offset;
unsigned long int ti_size;
} tls_index;
extern void *__tls_get_addr (tls_index *ti);

9
sysdeps/aarch64/morello/dl-tlsdesc.S
View File

@ -193,18 +193,9 @@ _dl_tlsdesc_dynamic:
SAVE_Q_REGISTERS
/* TODO: remove once __tls_get_addr is fixed. */
str c1, [csp, #32*8]
mov c0, c1
bl __tls_get_addr
/* TODO: __tls_get_addr should return bounded pointer,
currently it does not so bound it here. */
ldr c1, [csp, #32*8]
ldr x3, [c1, #TLSDESC_SIZE]
scbndse c0, c0, x3
mrs c2, ctpidr_el0 /* Restore c2. */
RESTORE_Q_REGISTERS