From 9001cb1102cddba54f0e84e147dfbb0356067356 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 3 Aug 2022 11:41:53 +0200 Subject: assert: Do not use stderr in libc-internal assert Redirect internal assertion failures to __libc_assert_fail, based on based on __libc_message, which writes directly to STDERR_FILENO and calls abort. Also disable message translation and reword the error message slightly (adjusting stdlib/tst-bz20544 accordingly). As a result of these changes, malloc no longer needs its own redefinition of __assert_fail. __libc_assert_fail needs to be stubbed out during rtld dependency analysis because the rtld rebuilds turn __libc_assert_fail into __assert_fail, which is unconditionally provided by elf/dl-minimal.c. This change is not possible for the public assert macro and its __assert_fail function because POSIX requires that the diagnostic is written to stderr. Reviewed-by: Adhemerval Zanella --- include/assert.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/assert.h b/include/assert.h index 61cc8aa22f..c812808f9b 100644 --- a/include/assert.h +++ b/include/assert.h @@ -20,8 +20,14 @@ extern void __assert_fail_base (const char *fmt, const char *assertion, const char *function) __THROW __attribute__ ((__noreturn__)) attribute_hidden; -# if IS_IN (libc) || (IS_IN (rtld) && !defined NO_RTLD_HIDDEN) -hidden_proto (__assert_fail) -hidden_proto (__assert_perror_fail) +rtld_hidden_proto (__assert_fail) +rtld_hidden_proto (__assert_perror_fail) +libc_hidden_proto (__assert_perror_fail) + + +# if IS_IN (libc) +/* Redirect to the internal version which does not use stderr. */ +extern _Noreturn __typeof (__assert_fail) __libc_assert_fail attribute_hidden; +# define __assert_fail __libc_assert_fail # endif #endif -- cgit v1.2.3