AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-09 02:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

x32/cet: Support shadow stack during startup for Linux 6.10

Browse Source 
Use RXX_LP in RTLD_START_ENABLE_X86_FEATURES.  Support shadow stack during
startup for Linux 6.10:

commit 2883f01ec37dd8668e7222dfdb5980c86fdfe277
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Mar 15 07:04:33 2024 -0700

    x86/shstk: Enable shadow stacks for x32

    1. Add shadow stack support to x32 signal.
    2. Use the 64-bit map_shadow_stack syscall for x32.
    3. Set up shadow stack for x32.

Add the map_shadow_stack system call to <fixup-asm-unistd.h> and regenerate
arch-syscall.h.  Tested on Intel Tiger Lake with CET enabled x32.  There
are no regressions with CET enabled x86-64.  There are no changes in CET
enabled x86-64 _dl_start_user.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com>
(cherry picked from commit 8344c1f551)
This commit is contained in:
H.J. Lu 2024-07-22 17:47:22 -07:00
parent eeff407b19
commit 9fbbe86f7c
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysdeps/unix/sysv/linux/x86_64/dl-cet.h
View File

@ -92,9 +92,9 @@ dl_cet_ibt_enabled (void)
# Pass GL(dl_x86_feature_1) to _dl_cet_setup_features.\n\ # Pass GL(dl_x86_feature_1) to _dl_cet_setup_features.\n\
movl %edx, %edi\n\ movl %edx, %edi\n\
# Align stack for the _dl_cet_setup_features call.\n\ # Align stack for the _dl_cet_setup_features call.\n\
andq $-16, %rsp\n\ and $-16, %" RSP_LP "\n\
call _dl_cet_setup_features\n\ call _dl_cet_setup_features\n\
# Restore %rax and %rsp from %r12 and %r13.\n\ # Restore %rax and %rsp from %r12 and %r13.\n\
movq %r12, %rax\n\ mov %" R12_LP ", %" RAX_LP "\n\
movq %r13, %rsp\n\ mov %" R13_LP ", %" RSP_LP "\n\
" "

1
sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h
View File

@ -151,6 +151,7 @@
#define __NR_lsetxattr 1073742013 #define __NR_lsetxattr 1073742013
#define __NR_lstat 1073741830 #define __NR_lstat 1073741830
#define __NR_madvise 1073741852 #define __NR_madvise 1073741852
#define __NR_map_shadow_stack 1073742277
#define __NR_mbind 1073742061 #define __NR_mbind 1073742061
#define __NR_membarrier 1073742148 #define __NR_membarrier 1073742148
#define __NR_memfd_create 1073742143 #define __NR_memfd_create 1073742143

4
sysdeps/unix/sysv/linux/x86_64/x32/fixup-asm-unistd.h
View File

@ -15,6 +15,10 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#ifndef __NR_map_shadow_stack
# define __NR_map_shadow_stack 1073742277
#endif
/* X32 uses the same 64-bit syscall interface for set_thread_area. */ /* X32 uses the same 64-bit syscall interface for set_thread_area. */
#ifndef __NR_set_thread_area #ifndef __NR_set_thread_area
# define __NR_set_thread_area 1073742029 # define __NR_set_thread_area 1073742029