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/s390 | |
| parent | 246f37d6b1c4c6c0a6365df8783e62e3adf208e8 (diff) | |
| download | glibc-88f4b6929c26f9240a4b0b7dcc62922f02544a09.zip glibc-88f4b6929c26f9240a4b0b7dcc62922f02544a09.tar.gz glibc-88f4b6929c26f9240a4b0b7dcc62922f02544a09.tar.bz2 | |
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/s390')
| -rw-r--r-- | sysdeps/s390/jmpbuf-unwind.h | 1 | ||||
| -rw-r--r-- | sysdeps/s390/s390-32/__longjmp.c | 1 | ||||
| -rw-r--r-- | sysdeps/s390/s390-32/setjmp.S | 1 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/__longjmp.c | 1 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/setjmp.S | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/sysdeps/s390/jmpbuf-unwind.h b/sysdeps/s390/jmpbuf-unwind.h index b4ff8da..10b37f0 100644 --- a/sysdeps/s390/jmpbuf-unwind.h +++ b/sysdeps/s390/jmpbuf-unwind.h @@ -21,6 +21,7 @@ #include <unwind.h> #include <bits/wordsize.h> #include <sysdep.h> +#include <pointer_guard.h> /* Test if longjmp to JMPBUF would unwind the frame diff --git a/sysdeps/s390/s390-32/__longjmp.c b/sysdeps/s390/s390-32/__longjmp.c index 09a3a2b..83d4232 100644 --- a/sysdeps/s390/s390-32/__longjmp.c +++ b/sysdeps/s390/s390-32/__longjmp.c @@ -17,6 +17,7 @@ #include <errno.h> #include <sysdep.h> +#include <pointer_guard.h> #include <setjmp.h> #include <bits/setjmp.h> #include <stdlib.h> diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S index c15c7bb..0870423 100644 --- a/sysdeps/s390/s390-32/setjmp.S +++ b/sysdeps/s390/s390-32/setjmp.S @@ -17,6 +17,7 @@ <https://www.gnu.org/licenses/>. */ #include <sysdep.h> +#include <pointer_guard.h> #define _ASM #define _SETJMP_H #include <bits/setjmp.h> diff --git a/sysdeps/s390/s390-64/__longjmp.c b/sysdeps/s390/s390-64/__longjmp.c index 2ca96e1..9fe4939 100644 --- a/sysdeps/s390/s390-64/__longjmp.c +++ b/sysdeps/s390/s390-64/__longjmp.c @@ -17,6 +17,7 @@ #include <errno.h> #include <sysdep.h> +#include <pointer_guard.h> #include <setjmp.h> #include <bits/setjmp.h> #include <stdlib.h> diff --git a/sysdeps/s390/s390-64/setjmp.S b/sysdeps/s390/s390-64/setjmp.S index 6dcd77d..5c59f57 100644 --- a/sysdeps/s390/s390-64/setjmp.S +++ b/sysdeps/s390/s390-64/setjmp.S @@ -17,6 +17,7 @@ <https://www.gnu.org/licenses/>. */ #include <sysdep.h> +#include <pointer_guard.h> #define _ASM #define _SETJMP_H #include <bits/setjmp.h> |