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 /wcsmbs | |
| 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 'wcsmbs')
| -rw-r--r-- | wcsmbs/btowc.c | 2 | ||||
| -rw-r--r-- | wcsmbs/mbrtoc16.c | 2 | ||||
| -rw-r--r-- | wcsmbs/mbrtoc8.c | 2 | ||||
| -rw-r--r-- | wcsmbs/mbrtowc.c | 2 | ||||
| -rw-r--r-- | wcsmbs/mbsnrtowcs.c | 2 | ||||
| -rw-r--r-- | wcsmbs/mbsrtowcs_l.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcrtomb.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcsnrtombs.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcsrtombs.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wctob.c | 2 |
10 files changed, 9 insertions, 11 deletions
diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c index 21e52a6..7023ec9 100644 --- a/wcsmbs/btowc.c +++ b/wcsmbs/btowc.c @@ -24,7 +24,7 @@ #include <wcsmbsload.h> #include <limits.h> -#include <sysdep.h> +#include <pointer_guard.h> wint_t diff --git a/wcsmbs/mbrtoc16.c b/wcsmbs/mbrtoc16.c index b23d9b0..f8b029b 100644 --- a/wcsmbs/mbrtoc16.c +++ b/wcsmbs/mbrtoc16.c @@ -22,7 +22,7 @@ #include <uchar.h> #include <wcsmbsload.h> -#include <sysdep.h> +#include <pointer_guard.h> #ifndef EILSEQ # define EILSEQ EINVAL diff --git a/wcsmbs/mbrtoc8.c b/wcsmbs/mbrtoc8.c index dd80b52..e745a49 100644 --- a/wcsmbs/mbrtoc8.c +++ b/wcsmbs/mbrtoc8.c @@ -23,8 +23,6 @@ #include <uchar.h> #include <wcsmbsload.h> -#include <sysdep.h> - #ifndef EILSEQ # define EILSEQ EINVAL #endif diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c index 78d9994..46a1cc3 100644 --- a/wcsmbs/mbrtowc.c +++ b/wcsmbs/mbrtowc.c @@ -22,7 +22,7 @@ #include <wchar.h> #include <wcsmbsload.h> -#include <sysdep.h> +#include <pointer_guard.h> #ifndef EILSEQ # define EILSEQ EINVAL diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c index 5860822..06a1f2d 100644 --- a/wcsmbs/mbsnrtowcs.c +++ b/wcsmbs/mbsnrtowcs.c @@ -23,7 +23,7 @@ #include <wchar.h> #include <wcsmbsload.h> -#include <sysdep.h> +#include <pointer_guard.h> #ifndef EILSEQ # define EILSEQ EINVAL diff --git a/wcsmbs/mbsrtowcs_l.c b/wcsmbs/mbsrtowcs_l.c index 0ebc389..526b88e 100644 --- a/wcsmbs/mbsrtowcs_l.c +++ b/wcsmbs/mbsrtowcs_l.c @@ -27,7 +27,7 @@ #include <wchar.h> #include <wcsmbsload.h> -#include <sysdep.h> +#include <pointer_guard.h> #ifndef EILSEQ # define EILSEQ EINVAL diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c index c0cce37..42690f2 100644 --- a/wcsmbs/wcrtomb.c +++ b/wcsmbs/wcrtomb.c @@ -25,7 +25,7 @@ #include <wchar.h> #include <wcsmbsload.h> -#include <sysdep.h> +#include <pointer_guard.h> #ifndef EILSEQ # define EILSEQ EINVAL diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c index 9707f6f..6ba180c 100644 --- a/wcsmbs/wcsnrtombs.c +++ b/wcsmbs/wcsnrtombs.c @@ -22,7 +22,7 @@ #include <wchar.h> #include <wcsmbsload.h> -#include <sysdep.h> +#include <pointer_guard.h> #ifndef EILSEQ # define EILSEQ EINVAL diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c index b1ac704..7db2b18 100644 --- a/wcsmbs/wcsrtombs.c +++ b/wcsmbs/wcsrtombs.c @@ -23,7 +23,7 @@ #include <wchar.h> #include <wcsmbsload.h> -#include <sysdep.h> +#include <pointer_guard.h> #ifndef EILSEQ # define EILSEQ EINVAL diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c index 573c2c9..5dfbd7a 100644 --- a/wcsmbs/wctob.c +++ b/wcsmbs/wctob.c @@ -22,7 +22,7 @@ #include <wchar.h> #include <wcsmbsload.h> -#include <sysdep.h> +#include <pointer_guard.h> int |