diff options
| author | Tulio Magno Quites Machado Filho <tuliom@redhat.com> | 2022-11-11 17:00:15 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@redhat.com> | 2022-11-29 15:07:22 -0300 |
| commit | 227df6243a2b5b4d70d11772d12c02eb9cb666ca (patch) | |
| tree | 3c4811c7f62c342178ae8b2b01c8858fa3a2fe8e | |
| parent | 885d340f20aab989482b8a1f844a224a1656d52c (diff) | |
| download | glibc-227df6243a2b5b4d70d11772d12c02eb9cb666ca.zip glibc-227df6243a2b5b4d70d11772d12c02eb9cb666ca.tar.gz glibc-227df6243a2b5b4d70d11772d12c02eb9cb666ca.tar.bz2 | |
Apply asm redirections in syslog.h before first use [BZ #27087]
Similar to d0fa09a770, but for syslog.h when _FORTIFY_SOURCE > 0.
Fixes [BZ #27087] by applying long double-related asm redirections
before using functions in bits/syslog.h.
Tested with build-many-glibcs.py.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| -rw-r--r-- | misc/bits/syslog.h | 18 | ||||
| -rw-r--r-- | misc/sys/syslog.h | 10 |
2 files changed, 19 insertions, 9 deletions
diff --git a/misc/bits/syslog.h b/misc/bits/syslog.h index fd30dd3..916d2b6 100644 --- a/misc/bits/syslog.h +++ b/misc/bits/syslog.h @@ -24,6 +24,20 @@ extern void __syslog_chk (int __pri, int __flag, const char *__fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4))); +#ifdef __USE_MISC +extern void __vsyslog_chk (int __pri, int __flag, const char *__fmt, + __gnuc_va_list __ap) + __attribute__ ((__format__ (__printf__, 3, 0))); +#endif + +#include <bits/floatn.h> +#if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 +# include <bits/syslog-ldbl.h> +#endif + +/* The following functions must be used only after applying all asm + redirections, e.g. long double asm redirections. */ + #ifdef __va_arg_pack __fortify_function void syslog (int __pri, const char *__fmt, ...) @@ -37,10 +51,6 @@ syslog (int __pri, const char *__fmt, ...) #ifdef __USE_MISC -extern void __vsyslog_chk (int __pri, int __flag, const char *__fmt, - __gnuc_va_list __ap) - __attribute__ ((__format__ (__printf__, 3, 0))); - __fortify_function void vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap) { diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h index d933fea..3888153 100644 --- a/misc/sys/syslog.h +++ b/misc/sys/syslog.h @@ -205,11 +205,11 @@ extern void vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap) /* Define some macros helping to catch buffer overflows. */ #if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function # include <bits/syslog.h> -#endif - -#include <bits/floatn.h> -#if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 -# include <bits/syslog-ldbl.h> +#else +# include <bits/floatn.h> +# if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 +# include <bits/syslog-ldbl.h> +# endif #endif __END_DECLS |