mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-27 21:20:18 +00:00
d6cc1829aa
The pad array in struct pthread_unwind_buf is used by setjmp to save shadow stack register. We assert that size of struct pthread_unwind_buf is no less than offset of shadow stack pointer + shadow stack pointer size. Since functions, like LIBC_START_MAIN, START_THREAD_DEFN as well as these with thread cancellation, call setjmp, but never return after __libc_unwind_longjmp, __libc_unwind_longjmp, which is defined as __libc_longjmp on x86, doesn't need to restore shadow stack register. __libc_longjmp, which is a private interface for thread cancellation implementation in libpthread, is changed to call __longjmp_cancel, instead of __longjmp. __longjmp_cancel is a new internal function in libc, which is similar to __longjmp, but doesn't restore shadow stack register. The compatibility longjmp and siglongjmp in libpthread.so are changed to call __libc_siglongjmp, instead of __libc_longjmp, so that they will restore shadow stack register. Tested with build-many-glibcs.py. Signed-off-by: H.J. Lu <hjl.tools@gmail.com> Reviewed-by: Carlos O'Donell <carlos@redhat.com> * nptl/pthread_create.c (START_THREAD_DEFN): Clear previous handlers after setjmp. * setjmp/longjmp.c (__libc_longjmp): Don't define alias if defined. * sysdeps/unix/sysv/linux/x86/setjmpP.h: Include <libc-pointer-arith.h>. (_JUMP_BUF_SIGSET_BITS_PER_WORD): New. (_JUMP_BUF_SIGSET_NSIG): Changed to 96. (_JUMP_BUF_SIGSET_NWORDS): Changed to use ALIGN_UP and _JUMP_BUF_SIGSET_BITS_PER_WORD. * sysdeps/x86/Makefile (sysdep_routines): Add __longjmp_cancel. * sysdeps/x86/__longjmp_cancel.S: New file. * sysdeps/x86/longjmp.c: Likewise. * sysdeps/x86/nptl/pt-longjmp.c: Likewise.
46 lines
1.6 KiB
C
46 lines
1.6 KiB
C
/* __libc_siglongjmp for x86.
|
|
Copyright (C) 2018 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#define __libc_longjmp __redirect___libc_longjmp
|
|
#include <setjmp/longjmp.c>
|
|
#undef __libc_longjmp
|
|
|
|
extern void __longjmp_cancel (__jmp_buf __env, int __val)
|
|
__attribute__ ((__noreturn__)) attribute_hidden;
|
|
|
|
/* Since __libc_longjmp is a private interface for cancellation
|
|
implementation in libpthread, there is no need to restore shadow
|
|
stack register. */
|
|
|
|
void
|
|
__libc_longjmp (sigjmp_buf env, int val)
|
|
{
|
|
/* Perform any cleanups needed by the frames being unwound. */
|
|
_longjmp_unwind (env, val);
|
|
|
|
if (env[0].__mask_was_saved)
|
|
/* Restore the saved signal mask. */
|
|
(void) __sigprocmask (SIG_SETMASK,
|
|
(sigset_t *) &env[0].__saved_mask,
|
|
(sigset_t *) NULL);
|
|
|
|
/* Call the machine-dependent function to restore machine state
|
|
without shadow stack. */
|
|
__longjmp_cancel (env[0].__jmpbuf, val ?: 1);
|
|
}
|