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 /stdlib | |
| 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 'stdlib')
| -rw-r--r-- | stdlib/cxa_atexit.c | 2 | ||||
| -rw-r--r-- | stdlib/cxa_finalize.c | 2 | ||||
| -rw-r--r-- | stdlib/cxa_thread_atexit_impl.c | 1 | ||||
| -rw-r--r-- | stdlib/exit.c | 2 | ||||
| -rw-r--r-- | stdlib/on_exit.c | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/stdlib/cxa_atexit.c b/stdlib/cxa_atexit.c index 1412dac..adf89e9 100644 --- a/stdlib/cxa_atexit.c +++ b/stdlib/cxa_atexit.c @@ -21,7 +21,7 @@ #include <libc-lock.h> #include "exit.h" -#include <sysdep.h> +#include <pointer_guard.h> #undef __cxa_atexit diff --git a/stdlib/cxa_finalize.c b/stdlib/cxa_finalize.c index d4db2e1..f247956 100644 --- a/stdlib/cxa_finalize.c +++ b/stdlib/cxa_finalize.c @@ -19,7 +19,7 @@ #include <stdlib.h> #include "exit.h" #include <register-atfork.h> -#include <sysdep.h> +#include <pointer_guard.h> #include <stdint.h> /* If D is non-NULL, call all functions registered with `__cxa_atexit' diff --git a/stdlib/cxa_thread_atexit_impl.c b/stdlib/cxa_thread_atexit_impl.c index 5cc8eb5..faacab3 100644 --- a/stdlib/cxa_thread_atexit_impl.c +++ b/stdlib/cxa_thread_atexit_impl.c @@ -75,6 +75,7 @@ #include <stdio.h> #include <stdlib.h> #include <ldsodefs.h> +#include <pointer_guard.h> typedef void (*dtor_func) (void *); diff --git a/stdlib/exit.c b/stdlib/exit.c index bc46109..e59156b 100644 --- a/stdlib/exit.c +++ b/stdlib/exit.c @@ -18,7 +18,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <sysdep.h> +#include <pointer_guard.h> #include <libc-lock.h> #include "exit.h" diff --git a/stdlib/on_exit.c b/stdlib/on_exit.c index 3e2d640..fb59db2 100644 --- a/stdlib/on_exit.c +++ b/stdlib/on_exit.c @@ -18,7 +18,7 @@ #include <assert.h> #include <stdlib.h> #include "exit.h" -#include <sysdep.h> +#include <pointer_guard.h> /* Register a function to be called by exit. */ int |