forked from rpms/glibc
1bc41d2121
Upstream commit: a4217408a3d6050a7f42ac23adb6ac7218dca85f
- Apply asm redirections in syslog.h before first use [BZ #27087]
- _Static_assert needs two arguments for compatibility with GCC before 9
Resolves: #2142974
Related: #2149102
Related: #2142935 (actually fixed in fb3d49c3bf)
73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
commit a4217408a3d6050a7f42ac23adb6ac7218dca85f
|
|
Author: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
|
|
Date: Fri Nov 11 17:00:15 2022 -0300
|
|
|
|
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>
|
|
(cherry picked from commit 227df6243a2b5b4d70d11772d12c02eb9cb666ca)
|
|
|
|
diff --git a/misc/bits/syslog.h b/misc/bits/syslog.h
|
|
index 6f3137a98ee593f3..10c9c1151382a51c 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 dc3b0e7ef81de812..e7a98fb9b13ce132 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
|