2021-01-02 19:32:25 +00:00
|
|
|
/* Copyright (C) 2002-2021 Free Software Foundation, Inc.
|
2002-08-31 08:06:48 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Andreas Jaeger <aj@suse.de>, 2002.
|
|
|
|
|
|
|
|
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
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
2002-08-31 08:06:48 +00:00
|
|
|
|
|
|
|
#include <sysdep.h>
|
|
|
|
|
x86-64/CET: Extend ucontext_t to save shadow stack
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.
2018-07-25 13:37:14 +00:00
|
|
|
#if SHSTK_ENABLED
|
|
|
|
# include <asm/prctl.h>
|
|
|
|
# include "ucontext_i.h"
|
|
|
|
|
|
|
|
/* Use CALL to push __start_context onto the new stack as well as the new
|
|
|
|
shadow stack. RDI points to ucontext:
|
|
|
|
Incoming:
|
|
|
|
__ssp[0]: The original caller's shadow stack pointer.
|
|
|
|
__ssp[1]: The size of the new shadow stack.
|
|
|
|
__ssp[2]: The size of the new shadow stack.
|
|
|
|
Outgoing:
|
|
|
|
__ssp[0]: The new shadow stack pointer.
|
|
|
|
__ssp[1]: The base address of the new shadow stack.
|
|
|
|
__ssp[2]: The size of the new shadow stack.
|
|
|
|
*/
|
|
|
|
|
|
|
|
ENTRY(__push___start_context)
|
|
|
|
/* Save the pointer to ucontext. */
|
|
|
|
movq %rdi, %r9
|
|
|
|
/* Get the original shadow stack pointer. */
|
|
|
|
rdsspq %r8
|
|
|
|
/* Save the original stack pointer. */
|
|
|
|
movq %rsp, %rdx
|
|
|
|
/* Load the top of the new stack into RSI. */
|
|
|
|
movq oRSP(%rdi), %rsi
|
|
|
|
/* Add 8 bytes to RSI since CALL will push the 8-byte return
|
|
|
|
address onto stack. */
|
|
|
|
leaq 8(%rsi), %rsp
|
|
|
|
/* Allocate the new shadow stack. The size of the new shadow
|
|
|
|
stack is passed in __ssp[1]. */
|
|
|
|
lea (oSSP + 8)(%rdi), %RSI_LP
|
|
|
|
movl $ARCH_CET_ALLOC_SHSTK, %edi
|
|
|
|
movl $__NR_arch_prctl, %eax
|
|
|
|
/* The new shadow stack base is returned in __ssp[1]. */
|
|
|
|
syscall
|
|
|
|
testq %rax, %rax
|
|
|
|
jne L(hlt) /* This should never happen. */
|
|
|
|
|
|
|
|
/* Get the size of the new shadow stack. */
|
|
|
|
movq 8(%rsi), %rdi
|
|
|
|
|
|
|
|
/* Get the base address of the new shadow stack. */
|
|
|
|
movq (%rsi), %rsi
|
|
|
|
|
|
|
|
/* Use the restore stoken to restore the new shadow stack. */
|
|
|
|
rstorssp -8(%rsi, %rdi)
|
|
|
|
|
|
|
|
/* Save the restore token on the original shadow stack. */
|
|
|
|
saveprevssp
|
|
|
|
|
|
|
|
/* Push the address of "jmp __start_context" onto the new stack
|
|
|
|
as well as the new shadow stack. */
|
|
|
|
call 1f
|
|
|
|
jmp __start_context
|
|
|
|
1:
|
|
|
|
|
|
|
|
/* Get the new shadow stack pointer. */
|
|
|
|
rdsspq %rdi
|
|
|
|
|
|
|
|
/* Use the restore stoken to restore the original shadow stack. */
|
|
|
|
rstorssp -8(%r8)
|
|
|
|
|
|
|
|
/* Save the restore token on the new shadow stack. */
|
|
|
|
saveprevssp
|
|
|
|
|
|
|
|
/* Store the new shadow stack pointer in __ssp[0]. */
|
|
|
|
movq %rdi, oSSP(%r9)
|
|
|
|
|
|
|
|
/* Restore the original stack. */
|
|
|
|
mov %rdx, %rsp
|
|
|
|
ret
|
|
|
|
END(__push___start_context)
|
|
|
|
#endif
|
|
|
|
|
2002-08-31 08:06:48 +00:00
|
|
|
/* This is the helper code which gets called if a function which is
|
|
|
|
registered with 'makecontext' returns. In this case we have to
|
|
|
|
install the context listed in the uc_link element of the context
|
|
|
|
'makecontext' manipulated at the time of the 'makecontext' call.
|
|
|
|
If the pointer is NULL the process must terminate. */
|
|
|
|
|
|
|
|
|
|
|
|
ENTRY(__start_context)
|
|
|
|
/* This removes the parameters passed to the function given to
|
|
|
|
'makecontext' from the stack. RBX contains the address
|
|
|
|
on the stack pointer for the next context. */
|
|
|
|
movq %rbx, %rsp
|
|
|
|
|
2015-07-12 21:38:58 +00:00
|
|
|
/* Don't use pop here so that stack is aligned to 16 bytes. */
|
|
|
|
movq (%rsp), %rdi /* This is the next context. */
|
2002-08-31 08:06:48 +00:00
|
|
|
testq %rdi, %rdi
|
|
|
|
je 2f /* If it is zero exit. */
|
|
|
|
|
2016-03-02 00:55:36 +00:00
|
|
|
call __setcontext
|
2002-08-31 08:06:48 +00:00
|
|
|
/* If this returns (which can happen if the syscall fails) we'll
|
|
|
|
exit the program with the return error value (-1). */
|
2012-07-17 08:06:02 +00:00
|
|
|
movq %rax,%rdi
|
2002-08-31 08:06:48 +00:00
|
|
|
|
2012-07-17 08:06:02 +00:00
|
|
|
2:
|
2003-08-28 00:04:58 +00:00
|
|
|
call HIDDEN_JUMPTARGET(exit)
|
2002-08-31 08:06:48 +00:00
|
|
|
/* The 'exit' call should never return. In case it does cause
|
|
|
|
the process to terminate. */
|
x86-64/CET: Extend ucontext_t to save shadow stack
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.
2018-07-25 13:37:14 +00:00
|
|
|
L(hlt):
|
2002-08-31 08:06:48 +00:00
|
|
|
hlt
|
|
|
|
END(__start_context)
|