mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 13:30:06 +00:00
25123a1c5c
This patch adds a field to ucontext_t to save shadow stack: 1. getcontext and swapcontext are updated to save the caller's shadow stack pointer and return addresses. 2. setcontext and swapcontext are updated to restore shadow stack and jump to new context directly. 3. makecontext is updated to allocate a new shadow stack and set the caller's return address to __start_context. Since makecontext allocates a new shadow stack when making a new context and kernel allocates a new shadow stack for clone/fork/vfork syscalls, we track the current shadow stack base. In setcontext and swapcontext, if the target shadow stack base is the same as the current shadow stack base, we unwind the shadow stack. Otherwise it is a stack switch and we look for a restore token. We enable shadow stack at run-time only if program and all used shared objects, including dlopened ones, are shadow stack enabled, which means that they must be compiled with GCC 8 or above and glibc 2.28 or above. We need to save and restore shadow stack only if shadow stack is enabled. When caller of getcontext, setcontext, swapcontext and makecontext is compiled with smaller ucontext_t, shadow stack won't be enabled at run-time. We check if shadow stack is enabled before accessing the extended field in ucontext_t. Reviewed-by: Carlos O'Donell <carlos@redhat.com> * sysdeps/unix/sysv/linux/x86/sys/ucontext.h (ucontext_t): Add __ssp. * sysdeps/unix/sysv/linux/x86_64/__start_context.S: Include <asm/prctl.h> and "ucontext_i.h" when shadow stack is enabled. (__push___start_context): New. * sysdeps/unix/sysv/linux/x86_64/getcontext.S: Include <asm/prctl.h>. (__getcontext): Record the current shadow stack base. Save the caller's shadow stack pointer and base. * sysdeps/unix/sysv/linux/x86_64/makecontext.c: Include <pthread.h>, <libc-pointer-arith.h> and <sys/prctl.h>. (__push___start_context): New prototype. (__makecontext): Call __push___start_context to allocate a new shadow stack, push __start_context onto the new stack as well as the new shadow stack. * sysdeps/unix/sysv/linux/x86_64/setcontext.S: Include <asm/prctl.h>. (__setcontext): Restore the target shadow stack. * sysdeps/unix/sysv/linux/x86_64/swapcontext.S: Include <asm/prctl.h>. (__swapcontext): Record the current shadow stack base. Save the caller's shadow stack pointer and base. Restore the target shadow stack. * sysdeps/unix/sysv/linux/x86_64/sysdep.h (STACK_SIZE_TO_SHADOW_STACK_SIZE_SHIFT): New. * sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym (oSSP): New.
39 lines
729 B
Plaintext
39 lines
729 B
Plaintext
#include <stddef.h>
|
|
#include <signal.h>
|
|
#include <sys/ucontext.h>
|
|
|
|
--
|
|
|
|
SIG_BLOCK
|
|
SIG_SETMASK
|
|
|
|
_NSIG8 (_NSIG / 8)
|
|
|
|
#define ucontext(member) offsetof (ucontext_t, member)
|
|
#define mcontext(member) ucontext (uc_mcontext.member)
|
|
#define mreg(reg) mcontext (gregs[REG_##reg])
|
|
|
|
oRBP mreg (RBP)
|
|
oRSP mreg (RSP)
|
|
oRBX mreg (RBX)
|
|
oR8 mreg (R8)
|
|
oR9 mreg (R9)
|
|
oR10 mreg (R10)
|
|
oR11 mreg (R11)
|
|
oR12 mreg (R12)
|
|
oR13 mreg (R13)
|
|
oR14 mreg (R14)
|
|
oR15 mreg (R15)
|
|
oRDI mreg (RDI)
|
|
oRSI mreg (RSI)
|
|
oRDX mreg (RDX)
|
|
oRAX mreg (RAX)
|
|
oRCX mreg (RCX)
|
|
oRIP mreg (RIP)
|
|
oEFL mreg (EFL)
|
|
oFPREGS mcontext (fpregs)
|
|
oSIGMASK ucontext (uc_sigmask)
|
|
oFPREGSMEM ucontext (__fpregs_mem)
|
|
oMXCSR ucontext (__fpregs_mem.mxcsr)
|
|
oSSP ucontext (__ssp)
|