diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2024-02-08 15:46:19 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2024-02-27 10:52:59 -0300 |
| commit | 471c3c7a4705f1a1852404959692b0ff2dbb4aaa (patch) | |
| tree | d3f3e0d35965c5767a0b4595aa12acb2d83d9d85 | |
| parent | 4289b00d4393f490515527864cf09093f4f8c2c4 (diff) | |
| download | glibc-471c3c7a4705f1a1852404959692b0ff2dbb4aaa.tar glibc-471c3c7a4705f1a1852404959692b0ff2dbb4aaa.tar.gz glibc-471c3c7a4705f1a1852404959692b0ff2dbb4aaa.tar.bz2 glibc-471c3c7a4705f1a1852404959692b0ff2dbb4aaa.zip | |
syslog: Improve fortify with clang
It improve fortify checks for syslog and vsyslog. The compile
and runtime hecks have similar coverage as with GCC.
The syslog fortify wrapper calls the va_arg version, since clang does
not support __va_arg_pack.
Checked on aarch64, armhf, x86_64, and i686.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
| -rw-r--r-- | misc/bits/syslog.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/misc/bits/syslog.h b/misc/bits/syslog.h index aadcd42000..100b0c78cc 100644 --- a/misc/bits/syslog.h +++ b/misc/bits/syslog.h @@ -36,6 +36,15 @@ syslog (int __pri, const char *__fmt, ...) { __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ()); } +#elif __fortify_use_clang && defined __USE_MISC +__fortify_function_error_function __attribute_overloadable__ void +syslog (int __pri, __fortify_clang_overload_arg (const char *, , __fmt), ...) +{ + __gnuc_va_list __fortify_ap; + __builtin_va_start (__fortify_ap, __fmt); + __vsyslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __fortify_ap); + __builtin_va_end (__fortify_ap); +} #elif !defined __cplusplus # define syslog(pri, ...) \ __syslog_chk (pri, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__) @@ -43,8 +52,9 @@ syslog (int __pri, const char *__fmt, ...) #ifdef __USE_MISC -__fortify_function void -vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap) +__fortify_function __attribute_overloadable__ void +vsyslog (int __pri, __fortify_clang_overload_arg (const char *, ,__fmt), + __gnuc_va_list __ap) { __vsyslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __ap); } |