picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdio: Clean up __libc_message after unconditional abort 

Since commit ec2c1fcefb ("malloc:
Abort on heap corruption, without a backtrace [BZ #21754]"),
__libc_message always terminates the process.  Since commit
a289ea09ea ("Do not print backtraces
on fatal glibc errors"), the backtrace facility has been removed.
Therefore, remove enum __libc_message_action and the action
argument of __libc_message, and mark __libc_message as _No_return.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2022-08-03 11:41:53 +02:00
parent fccadcdf5b
commit cca9684f2d
4 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debug/fortify_fail.c
View File

@ -21,8 +21,6 @@ void
__attribute__ ((noreturn)) __attribute__ ((noreturn))
__fortify_fail (const char *msg) __fortify_fail (const char *msg)
{ {
/* The loop is added only to keep gcc happy. */ __libc_message ("*** %s ***: terminated\n", msg);
while (1)
__libc_message (do_abort, "*** %s ***: terminated\n", msg);
} }
libc_hidden_def (__fortify_fail) libc_hidden_def (__fortify_fail)

9
include/stdio.h
View File

@ -143,18 +143,11 @@ extern int __gen_tempname (char *__tmpl, int __suffixlen, int __flags,
# define __GT_DIR 1 /* create a directory */ # define __GT_DIR 1 /* create a directory */
# define __GT_NOCREATE 2 /* just find a name not currently in use */ # define __GT_NOCREATE 2 /* just find a name not currently in use */
enum __libc_message_action
{
do_message = 0, /* Print message. */
do_abort = 1 << 0, /* Abort. */
};
/* Print out MESSAGE (which should end with a newline) on the error output /* Print out MESSAGE (which should end with a newline) on the error output
and abort. */ and abort. */
extern void __libc_fatal (const char *__message) extern void __libc_fatal (const char *__message)
__attribute__ ((__noreturn__)); __attribute__ ((__noreturn__));
extern void __libc_message (enum __libc_message_action action, _Noreturn void __libc_message (const char *__fnt, ...) attribute_hidden;
const char *__fnt, ...) attribute_hidden;
extern void __fortify_fail (const char *msg) __attribute__ ((__noreturn__)); extern void __fortify_fail (const char *msg) __attribute__ ((__noreturn__));
libc_hidden_proto (__fortify_fail) libc_hidden_proto (__fortify_fail)

5
malloc/malloc.c
View File

@ -297,8 +297,7 @@ _Noreturn static void
__malloc_assert (const char *assertion, const char *file, unsigned int line, __malloc_assert (const char *assertion, const char *file, unsigned int line,
const char *function) const char *function)
{ {
__libc_message (do_abort, "\ __libc_message ("Fatal glibc error: malloc assertion failure in %s: %s\n",
Fatal glibc error: malloc assertion failure in %s: %s\n",
function, assertion); function, assertion);
__builtin_unreachable (); __builtin_unreachable ();
} }
@ -5658,7 +5657,7 @@ static void
malloc_printerr (const char *str) malloc_printerr (const char *str)
{ {
#if IS_IN (libc) #if IS_IN (libc)
__libc_message (do_abort, "%s\n", str); __libc_message ("%s\n", str);
#else #else
__libc_fatal (str); __libc_fatal (str);
#endif #endif

45
sysdeps/posix/libc_fatal.c
View File

@ -54,7 +54,7 @@ struct str_list
/* Abort with an error message. */ /* Abort with an error message. */
void void
__libc_message (enum __libc_message_action action, const char *fmt, ...) __libc_message (const char *fmt, ...)
{ {
va_list ap; va_list ap;
int fd = -1; int fd = -1;
@ -123,36 +123,31 @@ __libc_message (enum __libc_message_action action, const char *fmt, ...)
WRITEV_FOR_FATAL (fd, iov, nlist, total); WRITEV_FOR_FATAL (fd, iov, nlist, total);
if ((action & do_abort)) total = (total + 1 + GLRO(dl_pagesize) - 1) & ~(GLRO(dl_pagesize) - 1);
struct abort_msg_s *buf = __mmap (NULL, total,
PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, -1, 0);
if (__glibc_likely (buf != MAP_FAILED))
{ {
total = ((total + 1 + GLRO(dl_pagesize) - 1) buf->size = total;
& ~(GLRO(dl_pagesize) - 1)); char *wp = buf->msg;
struct abort_msg_s *buf = __mmap (NULL, total, for (int cnt = 0; cnt < nlist; ++cnt)
PROT_READ | PROT_WRITE, wp = mempcpy (wp, iov[cnt].iov_base, iov[cnt].iov_len);
MAP_ANON | MAP_PRIVATE, -1, 0); *wp = '\0';
if (__glibc_likely (buf != MAP_FAILED))
{
buf->size = total;
char *wp = buf->msg;
for (int cnt = 0; cnt < nlist; ++cnt)
wp = mempcpy (wp, iov[cnt].iov_base, iov[cnt].iov_len);
*wp = '\0';
/* We have to free the old buffer since the application might /* We have to free the old buffer since the application might
catch the SIGABRT signal. */ catch the SIGABRT signal. */
struct abort_msg_s *old = atomic_exchange_acq (&__abort_msg, struct abort_msg_s *old = atomic_exchange_acq (&__abort_msg,
buf); buf);
if (old != NULL) if (old != NULL)
__munmap (old, old->size); __munmap (old, old->size);
}
} }
} }
va_end (ap); va_end (ap);
if ((action & do_abort)) /* Kill the application. */
/* Kill the application. */ abort ();
abort ();
} }
@ -161,6 +156,6 @@ __libc_fatal (const char *message)
{ {
/* The loop is added only to keep gcc happy. */ /* The loop is added only to keep gcc happy. */
while (1) while (1)
__libc_message (do_abort, "%s", message); __libc_message ("%s", message);
} }
libc_hidden_def (__libc_fatal) libc_hidden_def (__libc_fatal)