diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-10-18 17:00:07 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-10-18 17:03:55 +0200 |
| commit | 88f4b6929c26f9240a4b0b7dcc62922f02544a09 (patch) | |
| tree | 72acb4a359d3ec56729a910386bd1a002bd69e3c /sysdeps/x86_64 | |
| parent | 246f37d6b1c4c6c0a6365df8783e62e3adf208e8 (diff) | |
| download | glibc-88f4b6929c26f9240a4b0b7dcc62922f02544a09.tar.gz glibc-88f4b6929c26f9240a4b0b7dcc62922f02544a09.tar.xz glibc-88f4b6929c26f9240a4b0b7dcc62922f02544a09.zip | |
Introduce <pointer_guard.h>, extracted from <sysdep.h>
This allows us to define a generic no-op version of PTR_MANGLE and PTR_DEMANGLE. In the future, we can use PTR_MANGLE and PTR_DEMANGLE unconditionally in C sources, avoiding an unintended loss of hardening due to missing include files or unlucky header inclusion ordering. In i386 and x86_64, we can avoid a <tls.h> dependency in the C code by using the computed constant from <tcb-offsets.h>. <sysdep.h> no longer includes these definitions, so there is no cyclic dependency anymore when computing the <tcb-offsets.h> constants. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/x86_64')
| -rw-r--r-- | sysdeps/x86_64/__longjmp.S | 1 | ||||
| -rw-r--r-- | sysdeps/x86_64/jmpbuf-unwind.h | 1 | ||||
| -rw-r--r-- | sysdeps/x86_64/setjmp.S | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/sysdeps/x86_64/__longjmp.S b/sysdeps/x86_64/__longjmp.S index b51d79168c..6fdb4ccfbf 100644 --- a/sysdeps/x86_64/__longjmp.S +++ b/sysdeps/x86_64/__longjmp.S @@ -16,6 +16,7 @@ <https://www.gnu.org/licenses/>. */ #include <sysdep.h> +#include <pointer_guard.h> #include <jmpbuf-offsets.h> #include <jmp_buf-ssp.h> #include <asm-syntax.h> diff --git a/sysdeps/x86_64/jmpbuf-unwind.h b/sysdeps/x86_64/jmpbuf-unwind.h index 42ea37508e..c92b2633bc 100644 --- a/sysdeps/x86_64/jmpbuf-unwind.h +++ b/sysdeps/x86_64/jmpbuf-unwind.h @@ -20,6 +20,7 @@ #include <stdint.h> #include <unwind.h> #include <sysdep.h> +#include <pointer_guard.h> /* Test if longjmp to JMPBUF would unwind the frame containing a local variable at ADDRESS. */ diff --git a/sysdeps/x86_64/setjmp.S b/sysdeps/x86_64/setjmp.S index 1b77dcd4f9..3897e66dc4 100644 --- a/sysdeps/x86_64/setjmp.S +++ b/sysdeps/x86_64/setjmp.S @@ -17,6 +17,7 @@ <https://www.gnu.org/licenses/>. */ #include <sysdep.h> +#include <pointer_guard.h> #include <jmpbuf-offsets.h> #include <jmp_buf-ssp.h> #include <asm-syntax.h> |