diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-01-05 10:07:24 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-01-05 15:54:13 -0200 |
| commit | 38765ab68f329fd84a5984decc8953f8c89d6e5c (patch) | |
| tree | f5796bc5f6881805b7f9b2e02d3734a03bf03ed9 /string/strings.h | |
| parent | 983a9637f730fa265e228509d090c4c5f031d713 (diff) | |
| download | glibc-38765ab68f329fd84a5984decc8953f8c89d6e5c.tar glibc-38765ab68f329fd84a5984decc8953f8c89d6e5c.tar.gz glibc-38765ab68f329fd84a5984decc8953f8c89d6e5c.tar.bz2 glibc-38765ab68f329fd84a5984decc8953f8c89d6e5c.zip | |
Use fortify macros for b{zero,copy} along decl from strings.h
As described in BZ#20558, bzero and bcopy declaration can only benefit
from fortified macros when decl came from string.h and when __USE_MISC
is defined (default behaviour).
This is due no standard includes those functions in string.h, so they
are only declared if __USE_MISC is defined (as pointed out in comment 4).
However fortification should be orthogona to other features test macros,
i.e, any function should be fortified if that function is declared.
To fix this behavior, the patch moved the bzero, bcopy, and
__explicit_bzero_chk to a common header (string/bits/strings_fortified.h)
and explicit fortified inclusion macros similar to string.h is added
on strings.h. This allows to get fortified declarions by only including
strings.h.
Checked on x86_64-linux-gnu and along on a bootstrap installation to check
if the fortified are correctly triggered with example from bug report.
[BZ #20558]
* string/bits/string3.h [__USE_MISC] (bcopy): Move to
strings_fortified.h.
[__USE_MISC] (bzero): Likewise.
[__USE_MISC] (explicit_bzero): Likewise.
* string/strings.h: Include strings_fortified.h.
* string/Makefile (headers): Add strings_fortified.h.
* string/bits/strings_fortified.h: New file.
* include/bits/strings_fortified.h: Likewise.
Diffstat (limited to 'string/strings.h')
| -rw-r--r-- | string/strings.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/string/strings.h b/string/strings.h index ece21c8c7e..69b75b1219 100644 --- a/string/strings.h +++ b/string/strings.h @@ -136,4 +136,12 @@ __END_DECLS #endif /* string.h */ +#if __GNUC_PREREQ (3,4) && __USE_FORTIFY_LEVEL > 0 \ + && defined __fortify_function +/* Functions with security checks. */ +# if defined __USE_MISC || !defined __USE_XOPEN2K8 +# include <bits/strings_fortified.h> +# endif +#endif + #endif /* strings.h */ |